Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / nfs / inode.c

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0a972ee..28a0a3c 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1038,24 +1038,25 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
                                  nfs_wait_bit_killable, TASK_KILLABLE);
                if (ret)
                        goto out;
-               if (!(nfsi->cache_validity & NFS_INO_INVALID_DATA))
-                       goto out;
-               if (!test_and_set_bit_lock(NFS_INO_INVALIDATING, bitlock))
+               spin_lock(&inode->i_lock);
+               if (test_bit(NFS_INO_INVALIDATING, bitlock)) {
+                       spin_unlock(&inode->i_lock);
+                       continue;
+               }
+               if (nfsi->cache_validity & NFS_INO_INVALID_DATA)
                        break;
-       }
-
-       spin_lock(&inode->i_lock);
-       if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {
-               nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
-               spin_unlock(&inode->i_lock);
-               trace_nfs_invalidate_mapping_enter(inode);
-               ret = nfs_invalidate_mapping(inode, mapping);
-               trace_nfs_invalidate_mapping_exit(inode, ret);
-       } else {
-               /* something raced in and cleared the flag */
                spin_unlock(&inode->i_lock);
+               goto out;
        }
 
+       set_bit(NFS_INO_INVALIDATING, bitlock);
+       smp_wmb();
+       nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
+       spin_unlock(&inode->i_lock);
+       trace_nfs_invalidate_mapping_enter(inode);
+       ret = nfs_invalidate_mapping(inode, mapping);
+       trace_nfs_invalidate_mapping_exit(inode, ret);
+
        clear_bit_unlock(NFS_INO_INVALIDATING, bitlock);
        smp_mb__after_clear_bit();
        wake_up_bit(bitlock, NFS_INO_INVALIDATING);
@@ -1691,10 +1692,6 @@ struct inode *nfs_alloc_inode(struct super_block *sb)
                return NULL;
        nfsi->flags = 0UL;
        nfsi->cache_validity = 0UL;
-#ifdef CONFIG_NFS_V3_ACL
-       nfsi->acl_access = ERR_PTR(-EAGAIN);
-       nfsi->acl_default = ERR_PTR(-EAGAIN);
-#endif
 #if IS_ENABLED(CONFIG_NFS_V4)
        nfsi->nfs4_acl = NULL;
 #endif /* CONFIG_NFS_V4 */