LU-14182 lov: cancel layout lock on replay deadlock

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

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 7311a2f..6814416 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -212,6 +212,8 @@ static int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock)
        if (IS_ERR(env))
                RETURN(PTR_ERR(env));
 
+       OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_REPLAY_PAUSE, cfs_fail_val);
+
        /* reach MDC layer to flush data under  the DoM ldlm lock */
        rc = cl_object_flush(env, lli->lli_clob, lock);
        if (rc == -ENODATA) {
@@ -316,7 +318,7 @@ static void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
        lli = ll_i2info(inode);
 
        if (bits & MDS_INODELOCK_UPDATE)
-               ll_file_set_flag(lli, LLIF_UPDATE_ATIME);
+               set_bit(LLIF_UPDATE_ATIME, &lli->lli_flags);
 
        if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
                CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, "
@@ -370,8 +372,7 @@ static void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
        }
 
        if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&
-           inode->i_sb->s_root != NULL &&
-           inode != inode->i_sb->s_root->d_inode)
+           !is_root_inode(inode))
                ll_prune_aliases(inode);
 
        if (bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM))
@@ -614,6 +615,27 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)
        if (rc < 0)
                return ERR_PTR(rc);
        d_add(de, inode);
+
+       /* this needs only to be done for foreign symlink dirs as
+        * DCACHE_SYMLINK_TYPE is already set by d_flags_for_inode()
+        * kernel routine for files with symlink ops (ie, real symlink)
+        */
+       if (inode && S_ISDIR(inode->i_mode) &&
+           ll_sbi_has_foreign_symlink(ll_i2sbi(inode)) &&
+#ifdef HAVE_IOP_GET_LINK
+           inode->i_op->get_link) {
+#else
+           inode->i_op->follow_link) {
+#endif
+               CDEBUG(D_INFO, "%s: inode "DFID": faking foreign dir as a symlink\n",
+                      ll_i2sbi(inode)->ll_fsname, PFID(ll_inode2fid(inode)));
+               spin_lock(&de->d_lock);
+               /* like d_flags_for_inode() already does for files */
+               de->d_flags = (de->d_flags & ~DCACHE_ENTRY_TYPE) |
+                             DCACHE_SYMLINK_TYPE;
+               spin_unlock(&de->d_lock);
+       }
+
        CDEBUG(D_DENTRY, "Add dentry %p inode %p refc %d flags %#x\n",
               de, de->d_inode, ll_d_count(de), de->d_flags);
         return de;
@@ -1195,7 +1217,9 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
                        }
                }
 
-               if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN)) {
+               /* check also if a foreign file is openable */
+               if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN) &&
+                   ll_foreign_is_openable(dentry, open_flags)) {
                        /* Open dentry. */
                        if (S_ISFIFO(dentry->d_inode->i_mode)) {
                                /* We cannot call open here as it might
@@ -1681,6 +1705,10 @@ static int ll_rmdir(struct inode *dir, struct dentry *dchild)
        if (unlikely(d_mountpoint(dchild)))
                 RETURN(-EBUSY);
 
+       /* some foreign dir may not be allowed to be removed */
+       if (!ll_foreign_is_removable(dchild, false))
+               RETURN(-EPERM);
+
        op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name, name->len,
                                     S_IFDIR, LUSTRE_OPC_ANY, NULL);
        if (IS_ERR(op_data))
@@ -1766,6 +1794,10 @@ static int ll_unlink(struct inode *dir, struct dentry *dchild)
        if (unlikely(d_mountpoint(dchild)))
                RETURN(-EBUSY);
 
+       /* some foreign file/dir may not be allowed to be unlinked */
+       if (!ll_foreign_is_removable(dchild, false))
+               RETURN(-EPERM);
+
        op_data = ll_prep_md_op_data(NULL, dir, NULL, name->name, name->len, 0,
                                     LUSTRE_OPC_ANY, NULL);
        if (IS_ERR(op_data))