client capa list is sorted.

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

diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index 92335c6..5646ec1 100644 (file)
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -123,6 +123,27 @@ find_capa(struct hlist_head *head, uid_t uid, int capa_op, __u64 mdsid,
         return NULL;
 }
 
+static struct obd_capa *
+filter_find_capa(struct hlist_head *head, struct lustre_capa *capa)
+{
+        struct hlist_node *pos;
+        struct obd_capa *ocapa;
+
+        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;
+                }
+        }
+
+        return NULL;
+}
+
 inline void __capa_get(struct obd_capa *ocapa)
 {
         if (ocapa->c_type != CLIENT_CAPA)
@@ -217,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)
@@ -241,7 +264,13 @@ get_new_capa_locked(struct hlist_head *head, int type, struct lustre_capa *capa)
                 return NULL;
 
         spin_lock(&capa_lock);
-        old = find_capa(head, uid, capa_op, mdsid, ino, capa->lc_igen, type);
+
+        if (type == FILTER_CAPA)
+                old = filter_find_capa(head, capa);
+        else
+                old = find_capa(head, uid, capa_op, mdsid, ino,
+                                capa->lc_igen, type);
+
         if (!old) {
                 do_update_capa(ocapa, capa);
                 ocapa->c_type = type;
@@ -298,6 +327,20 @@ capa_get(uid_t uid, int capa_op,__u64 mdsid, unsigned long ino,
         return ocapa;
 }
 
+struct obd_capa * filter_capa_get(struct lustre_capa *capa)
+{
+        struct hlist_head *head = capa_hash +
+                capa_hashfn(capa->lc_uid, capa->lc_mdsid, capa->lc_ino);
+        struct obd_capa *ocapa;
+
+        spin_lock(&capa_lock);
+        ocapa = filter_find_capa(head, capa);
+        if (ocapa)
+                __capa_get(ocapa);
+        spin_unlock(&capa_lock);
+        return ocapa;
+}
+
 void capa_put(struct obd_capa *ocapa)
 {
         if (!ocapa)
@@ -327,11 +370,17 @@ struct obd_capa *capa_renew(struct lustre_capa *capa, int type)
         struct obd_capa *ocapa;
 
         spin_lock(&capa_lock);
-        ocapa = find_capa(head, uid, capa_op, mdsid, ino, capa->lc_igen, type);
+
+        if (type == FILTER_CAPA)
+                ocapa = filter_find_capa(head, capa);
+        else
+                ocapa = find_capa(head, uid, capa_op, mdsid, ino,
+                                  capa->lc_igen, type);
         if (ocapa) {
                 DEBUG_CAPA(D_INFO, capa, "renew %s", capa_type_name[type]);
                 do_update_capa(ocapa, capa);
         }
+
         spin_unlock(&capa_lock);
 
         if (!ocapa)
@@ -340,8 +389,9 @@ struct obd_capa *capa_renew(struct lustre_capa *capa, int type)
         return ocapa;
 }
 
-void capa_hmac(struct crypto_tfm *tfm, __u8 *key, struct lustre_capa *capa)
+void capa_hmac(__u8 *key, struct lustre_capa *capa)
 {
+        struct crypto_tfm *tfm;
         int keylen = CAPA_KEY_LEN;
         struct scatterlist sl = {
                 .page   = virt_to_page(capa),
@@ -349,8 +399,10 @@ void capa_hmac(struct crypto_tfm *tfm, __u8 *key, struct lustre_capa *capa)
                 .length = sizeof(struct lustre_capa_data),
         };
 
+        tfm = crypto_alloc_tfm(CAPA_HMAC_ALG, 0);
         LASSERT(tfm);
         crypto_hmac(tfm, key, &keylen, &sl, 1, capa->lc_hmac);
+        crypto_free_tfm(tfm);
 }
 
 void capa_dup(void *dst, struct obd_capa *ocapa)
@@ -400,6 +452,7 @@ int capa_is_to_expire(struct obd_capa *ocapa)
 
 EXPORT_SYMBOL(capa_op);
 EXPORT_SYMBOL(capa_get);
+EXPORT_SYMBOL(filter_capa_get);
 EXPORT_SYMBOL(capa_put);
 EXPORT_SYMBOL(capa_renew);
 EXPORT_SYMBOL(__capa_get);