LU-6142 llite: use d_is_symlink to test if dentry is a symlink

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

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 50bea97..0faaaea 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -60,11 +60,6 @@ static void ll_release(struct dentry *de)
         if (lld == NULL) /* NFS copies the de->d_op methods (bug 4655) */
                 RETURN_EXIT;
 
-        if (lld->lld_it) {
-                ll_intent_release(lld->lld_it);
-                OBD_FREE(lld->lld_it, sizeof(*lld->lld_it));
-        }
-
        de->d_fsdata = NULL;
        call_rcu(&lld->lld_rcu_head, free_dentry_data);
 
@@ -132,16 +127,16 @@ static int ll_ddelete(const struct dentry *de)
        ENTRY;
        LASSERT(de);
 
-       CDEBUG(D_DENTRY, "%s dentry %.*s (%p, parent %p, inode %p) %s%s\n",
-              d_lustre_invalid((struct dentry *)de) ? "deleting" : "keeping",
-              de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
+       CDEBUG(D_DENTRY, "%s dentry %pd (%p, parent %p, inode %p) %s%s\n",
+              d_lustre_invalid(de) ? "deleting" : "keeping",
+              de, de, de->d_parent, de->d_inode,
               d_unhashed((struct dentry *)de) ? "" : "hashed,",
               list_empty(&de->d_subdirs) ? "" : "subdirs");
 
        /* kernel >= 2.6.38 last refcount is decreased after this function. */
        LASSERT(ll_d_count(de) == 1);
 
-       if (d_lustre_invalid((struct dentry *)de))
+       if (d_lustre_invalid(de))
                RETURN(1);
        RETURN(0);
 }
@@ -151,9 +146,9 @@ int ll_d_init(struct dentry *de)
        ENTRY;
        LASSERT(de != NULL);
 
-       CDEBUG(D_DENTRY, "ldd on dentry %.*s (%p) parent %p inode %p refc %d\n",
-               de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
-               ll_d_count(de));
+       CDEBUG(D_DENTRY, "ldd on dentry %pd (%p) parent %p inode %p refc %d\n",
+              de, de, de->d_parent, de->d_inode,
+              ll_d_count(de));
 
        if (de->d_fsdata == NULL) {
                struct ll_dentry_data *lld;
@@ -194,8 +189,9 @@ void ll_intent_drop_lock(struct lookup_intent *it)
                if (it->it_remote_lock_mode != 0) {
                        handle.cookie = it->it_remote_lock_handle;
 
-                       CDEBUG(D_DLMTRACE, "releasing remote lock with cookie"
-                              "%#llx from it %p\n", handle.cookie, it);
+                       CDEBUG(D_DLMTRACE,
+                              "releasing remote lock with cookie %#llx from it %p\n",
+                              handle.cookie, it);
                        ldlm_lock_decref(&handle,
                                         it->it_remote_lock_mode);
                        it->it_remote_lock_mode = 0;
@@ -221,7 +217,8 @@ void ll_intent_release(struct lookup_intent *it)
        EXIT;
 }
 
-void ll_invalidate_aliases(struct inode *inode)
+/* mark aliases invalid and prune unused aliases */
+void ll_prune_aliases(struct inode *inode)
 {
        struct dentry *dentry;
        ENTRY;
@@ -232,16 +229,12 @@ void ll_invalidate_aliases(struct inode *inode)
               PFID(ll_inode2fid(inode)), inode);
 
        spin_lock(&inode->i_lock);
-       hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
-               CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p "
-                      "inode %p flags %d\n", dentry->d_name.len,
-                      dentry->d_name.name, dentry, dentry->d_parent,
-                      dentry->d_inode, dentry->d_flags);
-
-               d_lustre_invalidate(dentry, 0);
-       }
+       hlist_for_each_entry(dentry, &inode->i_dentry, d_alias)
+               d_lustre_invalidate(dentry);
        spin_unlock(&inode->i_lock);
 
+       d_prune_aliases(inode);
+
         EXIT;
 }
 
@@ -265,25 +258,21 @@ int ll_revalidate_it_finish(struct ptlrpc_request *request,
 
 void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry)
 {
-        LASSERT(it != NULL);
-        LASSERT(dentry != NULL);
+       LASSERT(it != NULL);
+       LASSERT(dentry != NULL);
 
        if (it->it_lock_mode && dentry->d_inode != NULL) {
-                struct inode *inode = dentry->d_inode;
-                struct ll_sb_info *sbi = ll_i2sbi(dentry->d_inode);
+               struct inode *inode = dentry->d_inode;
+               struct ll_sb_info *sbi = ll_i2sbi(inode);
 
                CDEBUG(D_DLMTRACE, "setting l_data to inode "DFID"(%p)\n",
                       PFID(ll_inode2fid(inode)), inode);
-                ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL);
-        }
-
-        /* drop lookup or getattr locks immediately */
-        if (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR) {
-                /* on 2.6 there are situation when several lookups and
-                 * revalidations may be requested during single operation.
-                 * therefore, we don't release intent here -bzzz */
-                ll_intent_drop_lock(it);
-        }
+               ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL);
+       }
+
+       /* drop lookup or getattr locks immediately */
+       if (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR)
+               ll_intent_drop_lock(it);
 }
 
 static int ll_revalidate_dentry(struct dentry *dentry,
@@ -301,12 +290,18 @@ static int ll_revalidate_dentry(struct dentry *dentry,
                return 1;
 
        /* Symlink - always valid as long as the dentry was found */
-#ifdef HAVE_IOP_GET_LINK
-       if (dentry->d_inode && dentry->d_inode->i_op->get_link)
-#else
-       if (dentry->d_inode && dentry->d_inode->i_op->follow_link)
-#endif
-               return 1;
+       /* only special case is to prevent ELOOP error from VFS during open
+        * of a foreign symlink file/dir with O_NOFOLLOW, like it happens for
+        * real symlinks. This will allow to open foreign symlink file/dir
+        * for get[dir]stripe/unlock ioctl()s.
+        */
+       if (d_is_symlink(dentry)) {
+               if (!S_ISLNK(dentry->d_inode->i_mode) &&
+                   !(lookup_flags & LOOKUP_FOLLOW))
+                       return 0;
+               else
+                       return 1;
+       }
 
        /*
         * VFS warns us that this is the second go around and previous
@@ -321,7 +316,7 @@ static int ll_revalidate_dentry(struct dentry *dentry,
                return -ECHILD;
 
        if (dentry_may_statahead(dir, dentry))
-               ll_statahead(dir, &dentry, dentry->d_inode == NULL);
+               ll_revalidate_statahead(dir, &dentry, dentry->d_inode == NULL);
 
        return 1;
 }