merge b_md into HEAD:

[fs/lustre-release.git] / lustre / llite / dcache.c

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 577d288..a9d4aac 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -20,13 +20,15 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
+#include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <linux/obd_support.h>
 #include <linux/lustre_lite.h>
+#include <linux/lustre_idl.h>
 #include <linux/lustre_dlm.h>
 
 extern struct address_space_operations ll_aops;
@@ -39,18 +41,12 @@ void ll_release(struct dentry *de)
         EXIT;
 }
 
-void ll_intent_release(struct dentry *de)
+extern void d_delete_aliases(struct inode *);
+void ll_intent_release(struct dentry *de, struct lookup_intent *it)
 {
-        struct lookup_intent *it;
         struct lustre_handle *handle;
         ENTRY;
 
-        it = de->d_it;
-        if (it == NULL) {
-                EXIT;
-                return;
-        }
-
         LASSERT(ll_d2d(de) != NULL);
 
         if (it->it_lock_mode) {
@@ -63,70 +59,93 @@ void ll_intent_release(struct dentry *de)
                                 CERROR("ldlm_cli_cancel: %d\n", rc);
                 } else
                         ldlm_lock_decref(handle, it->it_lock_mode);
+
+                /* intent_release may be called multiple times, and we don't
+                 * want to double-decref this lock (see bug 494) */
+                it->it_lock_mode = 0;
         }
-        de->d_it = NULL;
-        //up(&ll_d2d(de)->lld_it_sem);
+
+        if (!de->d_it || it->it_op == IT_RELEASED_MAGIC) {
+                EXIT;
+                return;
+        }
+
+        if (de->d_it == it)
+                LL_GET_INTENT(de, it);
+
         EXIT;
 }
 
-int ll_revalidate2(struct dentry *de, int flags, struct lookup_intent *it)
+extern struct dentry *ll_find_alias(struct inode *, struct dentry *);
+
+static int revalidate2_finish(int flag, struct ptlrpc_request *request,
+                          struct dentry **de,
+                          struct lookup_intent *it,
+                          int offset, obd_id ino)
+{
+        ldlm_lock_set_data((struct lustre_handle *)it->it_lock_handle,
+                           (*de)->d_inode, sizeof(*((*de)->d_inode)));
+        ptlrpc_req_finished(request);
+        return 0;
+}
+
+int ll_have_md_lock(struct dentry *de)
 {
         struct ll_sb_info *sbi = ll_s2sbi(de->d_sb);
         struct lustre_handle lockh;
         __u64 res_id[RES_NAME_SIZE] = {0};
         struct obd_device *obddev;
-        int rc = 0;
         ENTRY;
 
-        if (it) {
-                CDEBUG(D_INFO, "name: %*s, intent: %s\n", de->d_name.len,
-                       de->d_name.name, ldlm_it2str(it->it_op));
-                if (it->it_op == IT_RENAME)
-                        it->it_data = de;
-        }
-
         if (!de->d_inode)
-                GOTO(out, rc = 0);
+               RETURN(0);
 
         obddev = class_conn2obd(&sbi->ll_mdc_conn);
         res_id[0] = de->d_inode->i_ino;
+        res_id[1] = de->d_inode->i_generation;
 
         CDEBUG(D_INFO, "trying to match res "LPU64"\n", res_id[0]);
 
-        if (ldlm_lock_match(obddev->obd_namespace, res_id, LDLM_MDSINTENT,
+        if (ldlm_lock_match(obddev->obd_namespace, res_id, LDLM_PLAIN,
                             NULL, 0, LCK_PR, &lockh)) {
                 ldlm_lock_decref(&lockh, LCK_PR);
-                GOTO(out, rc = 1);
+                RETURN(1);
         }
 
-        if (ldlm_lock_match(obddev->obd_namespace, res_id, LDLM_MDSINTENT,
+        if (ldlm_lock_match(obddev->obd_namespace, res_id, LDLM_PLAIN,
                             NULL, 0, LCK_PW, &lockh)) {
                 ldlm_lock_decref(&lockh, LCK_PW);
-                GOTO(out, rc = 1);
+                RETURN(1);
         }
+        RETURN(0);
+}
 
-        /* If the dentry is busy, we won't get called in lookup2 if we
-         * return 0, so return 1.
-         *
-         * This is a temporary fix for bug 618962, but is one of the causes of
-         * 619078. */
-        CDEBUG(D_INFO, "d_count: %d\n", atomic_read(&de->d_count));
-        if (it && atomic_read(&de->d_count) > 0) {
-                CERROR("returning 1 for %*s during %s because d_count is %d\n",
-                       de->d_name.len, de->d_name.name, ldlm_it2str(it->it_op),
-                       atomic_read(&de->d_count));
-                GOTO(out, rc = 1);
-        }
+int ll_revalidate2(struct dentry *de, int flags, struct lookup_intent *it)
+{
+        int rc;
+        ENTRY;
 
- out:
-        if (ll_d2d(de) == NULL) {
-                CERROR("allocating fsdata\n");
-                ll_set_dd(de);
+        /* We don't want to cache negative dentries, so return 0 immediately.
+         * We believe that this is safe, that negative dentries cannot be
+         * pinned by someone else */
+        if (de->d_inode == NULL) {
+                CDEBUG(D_INODE, "negative dentry: ret 0 to force lookup2\n");
+                RETURN(0);
         }
-        //down(&ll_d2d(de)->lld_it_sem);
-        // de->d_it = it;
 
-        RETURN(rc);
+        rc = ll_intent_lock(de->d_parent->d_inode, &de, it, revalidate2_finish);
+        if (rc < 0) {
+                /* Something bad happened; overwrite it_status? */
+                CERROR("ll_intent_lock: %d\n", rc);
+        }
+        /* unfortunately ll_intent_lock may cause a callback and revoke our
+           dentry */
+        spin_lock(&dcache_lock);
+        list_del_init(&de->d_hash);
+        spin_unlock(&dcache_lock);
+        d_rehash(de);
+
+        RETURN(1);
 }
 
 int ll_set_dd(struct dentry *de)