- don't make noise if we found needed capa

- minor cleanups

diff --git a/lustre/llite/llite_capa.c b/lustre/llite/llite_capa.c
index 5962d84..b9e8e05 100644 (file)
--- a/lustre/llite/llite_capa.c
+++ b/lustre/llite/llite_capa.c
@@ -341,8 +341,8 @@ struct obd_capa *ll_get_capa(struct inode *inode, uid_t uid, int op)
         }
 
         if (atomic_read(&ll_capa_stat)) {
-                CDEBUG(D_ERROR, "find capa for (uid %u, op %d, mdsid "LPU64","
-                       " ino %u igen %u) failed.\n",
+                CDEBUG(D_ERROR, "can't find capa for (uid %u, op %d, mdsid "
+                       LPU64", ino %u igen %u) failed.\n",
                        (unsigned)uid, op, id_group(&lli->lli_id),
                        (unsigned)id_ino(&lli->lli_id), id_gen(&lli->lli_id));
                 atomic_set(&ll_capa_stat, 0);

diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index a15fe61..0502287 100644 (file)
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -324,9 +324,9 @@ capa_get(uid_t uid, int capa_op,__u64 mdsid, unsigned long ino,
 
         ocapa = find_capa_locked(head, uid, capa_op, mdsid, ino, igen, type);
         
-        if (ocapa == NULL && type == CLIENT_CAPA && atomic_read(&ll_capa_stat)){
-                CDEBUG(D_ERROR, "find capa for (uid %u, op %d, mdsid "LPU64","
-                       " ino %lu igen %u, type %d) failed.\n",
+        if (type == CLIENT_CAPA && !ocapa && atomic_read(&ll_capa_stat)) {
+                CDEBUG(D_ERROR, "can't find capa for (uid %u, op %d, mdsid "
+                       LPU64", ino %lu igen %u, type %d) failed.\n",
                        (unsigned) uid, capa_op, mdsid, ino, igen, type);
                 atomic_set(&ll_capa_stat, 0);
         }
@@ -460,6 +460,15 @@ int capa_is_to_expire(struct obd_capa *ocapa)
         return rc;
 }
 
+void dump_capa_hmac(char *buf, char *key)
+{
+        int i, n = 0;
+
+        for (i = 0; i < CAPA_DIGEST_SIZE; i++)
+                n += sprintf(buf + n, "%02x", (unsigned char) key[i]);
+}
+
+
 EXPORT_SYMBOL(capa_op);
 EXPORT_SYMBOL(capa_get);
 EXPORT_SYMBOL(filter_capa_get);
@@ -472,3 +481,5 @@ EXPORT_SYMBOL(capa_dup2);
 EXPORT_SYMBOL(capa_expired);
 EXPORT_SYMBOL(__capa_is_to_expire);
 EXPORT_SYMBOL(capa_is_to_expire);
+EXPORT_SYMBOL(dump_capa_hmac);
+

diff --git a/lustre/obdfilter/filter_capa.c b/lustre/obdfilter/filter_capa.c
index 8bd2584..78613a3 100644 (file)
--- a/lustre/obdfilter/filter_capa.c
+++ b/lustre/obdfilter/filter_capa.c
@@ -208,14 +208,6 @@ int filter_verify_fid(struct obd_export *exp, struct inode *inode,
         RETURN(0);
 }
 
-static void dump_capa_hmac(char *buf, char *key)
-{
-        int i, n = 0;
-
-        for (i = 0; i < CAPA_DIGEST_SIZE; i++)
-                n += sprintf(buf + n, "%02x", (unsigned char) key[i]);
-}
-
 int
 filter_verify_capa(int cmd, struct obd_export *exp, struct lustre_capa *capa)
 {