diff --git a/lustre/mds/mds_capa.c b/lustre/mds/mds_capa.c
index 6f8d09109799baa87b089c0350c1d9255d6a117d..8b29840955aac746f7e248e5c0fa94d753c827f4 100644
--- a/lustre/mds/mds_capa.c
+++ b/lustre/mds/mds_capa.c
@@ -515,7 +515,7 @@ int mds_pack_capa(struct obd_device *obd, struct mds_export_data *med,
                 if (mfd == NULL) {
                         DEBUG_CAPA(D_INFO, req_capa, "no handle "LPX64" for",
                                    req_body->handle.cookie);
-                        RETURN(-ESTALE);
+                        RETURN(-ENOENT);
                 }
 
                 mode = accmode(mfd->mfd_mode);
diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index 36caa8081ab2b7423a7593a8ade76e8b470b2025..92335c61ea296bf4c2aa1b66d24299e60ff4f6fa 100644
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -340,14 +340,6 @@ struct obd_capa *capa_renew(struct lustre_capa *capa, int type)
         return ocapa;
 }
 
-static void dump_capa_key(char *buf, char *key)
-{
-        int i, n = 0;
-
-        for (i = 0; i < CAPA_KEY_LEN; i++)
-                n += sprintf(buf + n, "%02x", (unsigned char) key[i]);
-}
-
 void capa_hmac(struct crypto_tfm *tfm, __u8 *key, struct lustre_capa *capa)
 {
         int keylen = CAPA_KEY_LEN;
@@ -359,15 +351,6 @@ void capa_hmac(struct crypto_tfm *tfm, __u8 *key, struct lustre_capa *capa)
 
         LASSERT(tfm);
         crypto_hmac(tfm, key, &keylen, &sl, 1, capa->lc_hmac);
-        {
-        char *buf = NULL;
-
-        OBD_ALLOC(buf, keylen * 2 + 1);
-        if (key) {
-                dump_capa_key(buf, key);
-                DEBUG_CAPA(D_INODE, capa, "hmac with %s", buf);
-        }
-        }
 }
 
 void capa_dup(void *dst, struct obd_capa *ocapa)