file export-do_kern_mount.patch was initially added on branch b1_5.

[fs/lustre-release.git] / lustre / obdclass / capa.c

diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index 5a78a82..3a5d75f 100644 (file)
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -61,11 +61,13 @@ static char *capa_type_name[] = { "client", "mds", "filter" };
  * in the future it will be moved to ll_sb_info to support multi-
  * mount point */
 struct timer_list ll_capa_timer;
+atomic_t ll_capa_stat = ATOMIC_INIT(0);
 
 EXPORT_SYMBOL(capa_lock);
 EXPORT_SYMBOL(capa_hash);
 EXPORT_SYMBOL(capa_list);
 EXPORT_SYMBOL(ll_capa_timer);
+EXPORT_SYMBOL(ll_capa_stat);
 
 static inline int const
 capa_hashfn(unsigned int uid, __u64 mdsid, unsigned long ino)
@@ -92,8 +94,6 @@ find_capa(struct hlist_head *head, uid_t uid, int capa_op, __u64 mdsid,
         struct obd_capa *ocapa;
         uid_t ouid;
 
-        CDEBUG(D_INODE, "find capa for (uid %u, op %d, mdsid "LPU64", ino %lu"
-               " igen %u, type %d\n", (unsigned) uid, capa_op, mdsid, ino, igen, type);
         hlist_for_each_entry(ocapa, pos, head, c_hash) {
                 if (ocapa->c_capa.lc_ino != ino)
                         continue;
@@ -132,9 +132,9 @@ filter_find_capa(struct hlist_head *head, struct lustre_capa *capa)
         hlist_for_each_entry(ocapa, pos, head, c_hash) {
                 if (ocapa->c_type != FILTER_CAPA)
                         continue;
+
                 if (!memcmp(&ocapa->c_capa, capa,
                             sizeof(struct lustre_capa_data))) {
-
                         DEBUG_CAPA(D_INODE, &ocapa->c_capa, "found %s",
                                    capa_type_name[ocapa->c_type]);
                         return ocapa;
@@ -238,9 +238,11 @@ static inline void list_add_capa(struct obd_capa *ocapa, struct list_head *head)
                                 return;
                         }
                 }
+                list_add(&ocapa->c_list, head);
+                return;
         }
 
-        list_add(&ocapa->c_list, head);
+        list_add_tail(&ocapa->c_list, head);
 }
 
 static inline void do_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa)
@@ -322,6 +324,13 @@ 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 (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)\n",
+                       (unsigned) uid, capa_op, mdsid, ino, igen, type);
+                atomic_set(&ll_capa_stat, 0);
+        }
+
         return ocapa;
 }
 
@@ -339,14 +348,11 @@ struct obd_capa * filter_capa_get(struct lustre_capa *capa)
         return ocapa;
 }
 
-void capa_put(struct obd_capa *ocapa)
+void capa_put_nolock(struct obd_capa *ocapa)
 {
-        if (!ocapa)
-                return;
-
         DEBUG_CAPA(D_INODE, &ocapa->c_capa, "put %s",
                    capa_type_name[ocapa->c_type]);
-        spin_lock(&capa_lock);
+
         if (ocapa->c_type == CLIENT_CAPA) {
                 list_del_init(&ocapa->c_lli_list);
                 __capa_put(ocapa);
@@ -354,6 +360,15 @@ void capa_put(struct obd_capa *ocapa)
         } else {
                 atomic_dec(&ocapa->c_refc);
         }
+}
+
+void capa_put(struct obd_capa *ocapa)
+{
+        if (!ocapa)
+                return;
+
+        spin_lock(&capa_lock);
+        capa_put_nolock(ocapa);
         spin_unlock(&capa_lock);
 }
 
@@ -384,6 +399,9 @@ struct obd_capa *capa_renew(struct lustre_capa *capa, int type)
         if (!ocapa)
                 ocapa = get_new_capa_locked(head, type, capa);
 
+        if (type == CLIENT_CAPA)
+                atomic_set(&ll_capa_stat, 1);
+
         return ocapa;
 }
 
@@ -448,15 +466,27 @@ 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(__capa_get);
 EXPORT_SYMBOL(filter_capa_get);
 EXPORT_SYMBOL(capa_put);
+EXPORT_SYMBOL(capa_put_nolock);
 EXPORT_SYMBOL(capa_renew);
-EXPORT_SYMBOL(__capa_get);
 EXPORT_SYMBOL(capa_hmac);
 EXPORT_SYMBOL(capa_dup);
 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);
+