typo.

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

diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index 3bd0a71..36caa80 100644 (file)
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -68,10 +68,9 @@ EXPORT_SYMBOL(capa_list);
 EXPORT_SYMBOL(ll_capa_timer);
 
 static inline int const
-capa_hashfn(unsigned int uid, int capa_op, __u64 mdsid, unsigned long ino)
+capa_hashfn(unsigned int uid, __u64 mdsid, unsigned long ino)
 {
-        return (ino ^ uid) * (unsigned long)capa_op * (unsigned long)(mdsid + 1)
-               % NR_CAPAHASH;
+        return (ino ^ uid) * (unsigned long)(mdsid + 1) % NR_CAPAHASH;
 }
 
 int capa_op(int flags)
@@ -87,15 +86,19 @@ int capa_op(int flags)
 
 static struct obd_capa *
 find_capa(struct hlist_head *head, uid_t uid, int capa_op, __u64 mdsid,
-          unsigned long ino, int type)
+          unsigned long ino, __u32 igen, int type)
 {
         struct hlist_node *pos;
         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;
+                if (ocapa->c_capa.lc_igen != igen)
+                        continue;
                 if (ocapa->c_capa.lc_mdsid != mdsid)
                         continue;
                 if ((ocapa->c_capa.lc_op & capa_op) != ocapa->c_capa.lc_op)
@@ -111,7 +114,7 @@ find_capa(struct hlist_head *head, uid_t uid, int capa_op, __u64 mdsid,
                 if (ouid != uid)
                         continue;
 
-                DEBUG_CAPA(D_CACHE, &ocapa->c_capa, "found %s",
+                DEBUG_CAPA(D_INODE, &ocapa->c_capa, "found %s",
                            capa_type_name[ocapa->c_type]);
 
                 return ocapa;
@@ -128,12 +131,12 @@ inline void __capa_get(struct obd_capa *ocapa)
 
 static struct obd_capa *
 find_capa_locked(struct hlist_head *head, uid_t uid, int capa_op, __u64 mdsid,
-                 unsigned long ino, int type)
+                 unsigned long ino, __u32 igen, int type)
 {
         struct obd_capa *ocapa;
 
         spin_lock(&capa_lock);
-        ocapa = find_capa(head, uid, capa_op, mdsid, ino, type);
+        ocapa = find_capa(head, uid, capa_op, mdsid, ino, igen, type);
         if (ocapa)
                 __capa_get(ocapa);
         spin_unlock(&capa_lock);
@@ -238,7 +241,7 @@ 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, type);
+        old = find_capa(head, uid, capa_op, mdsid, ino, capa->lc_igen, type);
         if (!old) {
                 do_update_capa(ocapa, capa);
                 ocapa->c_type = type;
@@ -246,10 +249,11 @@ get_new_capa_locked(struct hlist_head *head, int type, struct lustre_capa *capa)
                 hlist_add_head(&ocapa->c_hash, head);
                 if (type == CLIENT_CAPA)
                         INIT_LIST_HEAD(&ocapa->c_lli_list);
+                __capa_get(ocapa);
 
                 capa_count[type]++;
 
-                DEBUG_CAPA(D_CACHE, &ocapa->c_capa, "new %s",
+                DEBUG_CAPA(D_INODE, &ocapa->c_capa, "new %s",
                            capa_type_name[type]);
 
                 if (type != CLIENT_CAPA && capa_count[type] > CAPA_CACHE_SIZE) {
@@ -264,7 +268,7 @@ get_new_capa_locked(struct hlist_head *head, int type, struct lustre_capa *capa)
                                 node = node->next;
                                 if (atomic_read(&tcapa->c_refc) > 0)
                                         continue;
-                                DEBUG_CAPA(D_CACHE, &tcapa->c_capa,
+                                DEBUG_CAPA(D_INODE, &tcapa->c_capa,
                                            "free unused %s",
                                            capa_type_name[type]);
                                 __capa_put(tcapa);
@@ -283,13 +287,13 @@ get_new_capa_locked(struct hlist_head *head, int type, struct lustre_capa *capa)
 }
 
 struct obd_capa *
-capa_get(uid_t uid, int capa_op,__u64 mdsid, unsigned long ino, int type)
+capa_get(uid_t uid, int capa_op,__u64 mdsid, unsigned long ino,
+         __u32 igen, int type)
 {
-        struct hlist_head *head = capa_hash +
-                                  capa_hashfn(uid, capa_op, mdsid, ino);
+        struct hlist_head *head = capa_hash + capa_hashfn(uid, mdsid, ino);
         struct obd_capa *ocapa;
 
-        ocapa = find_capa_locked(head, uid, capa_op, mdsid, ino, type);
+        ocapa = find_capa_locked(head, uid, capa_op, mdsid, ino, igen, type);
         
         return ocapa;
 }
@@ -299,7 +303,7 @@ void capa_put(struct obd_capa *ocapa)
         if (!ocapa)
                 return;
 
-        DEBUG_CAPA(D_CACHE, &ocapa->c_capa, "put %s",
+        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) {
@@ -319,11 +323,11 @@ struct obd_capa *capa_renew(struct lustre_capa *capa, int type)
         __u64 mdsid = capa->lc_mdsid;
         unsigned long ino = capa->lc_ino;
         struct hlist_head *head = capa_hash +
-                                  capa_hashfn(uid, capa_op, mdsid, ino);
+                                  capa_hashfn(uid, mdsid, ino);
         struct obd_capa *ocapa;
 
         spin_lock(&capa_lock);
-        ocapa = find_capa(head, uid, capa_op, mdsid, ino, type);
+        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);
@@ -336,6 +340,14 @@ 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;
@@ -347,6 +359,15 @@ 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)
@@ -371,24 +392,24 @@ int capa_expired(struct lustre_capa *capa)
         return ((unsigned long )capa->lc_expiry <= tv.tv_sec) ? 1 : 0;
 }
 
-int __capa_is_to_expire(struct obd_capa *ocapa)
+int __capa_is_to_expire(struct obd_capa *ocapa, struct timeval *tv)
 {
-        struct timeval tv;
         int pre_expiry = capa_pre_expiry(&ocapa->c_capa);
 
-        do_gettimeofday(&tv);
-        /* XXX: in case the lock is inaccurate, minus one more
+        /* XXX: in case the clock is inaccurate, minus one more
          * pre_expiry to make sure the expiry won't miss */
         return ((unsigned long)ocapa->c_capa.lc_expiry -
-                2 * pre_expiry <= tv.tv_sec)? 1 : 0;
+                2 * pre_expiry <= tv->tv_sec)? 1 : 0;
 }
 
 int capa_is_to_expire(struct obd_capa *ocapa)
 {
+        struct timeval tv;
         int rc;
 
+        do_gettimeofday(&tv);
         spin_lock(&capa_lock);
-        rc = __capa_is_to_expire(ocapa);
+        rc = __capa_is_to_expire(ocapa, &tv);
         spin_unlock(&capa_lock);
 
         return rc;