Merge tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-block.git] / fs / nfs / dir.c

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 927fd2768eadeeb4ce57ab7438e802e640cac9ea..e51ae52ed14ff5ef6bc28dd4d9e60d1f33a9fb6c 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1074,7 +1074,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
        int error;
 
        if (flags & LOOKUP_RCU) {
-               parent = ACCESS_ONCE(dentry->d_parent);
+               parent = READ_ONCE(dentry->d_parent);
                dir = d_inode_rcu(parent);
                if (!dir)
                        return -ECHILD;
@@ -1161,7 +1161,7 @@ out_set_verifier:
        nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
  out_valid:
        if (flags & LOOKUP_RCU) {
-               if (parent != ACCESS_ONCE(dentry->d_parent))
+               if (parent != READ_ONCE(dentry->d_parent))
                        return -ECHILD;
        } else
                dput(parent);
@@ -1575,7 +1575,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)
                struct inode *dir;
 
                if (flags & LOOKUP_RCU) {
-                       parent = ACCESS_ONCE(dentry->d_parent);
+                       parent = READ_ONCE(dentry->d_parent);
                        dir = d_inode_rcu(parent);
                        if (!dir)
                                return -ECHILD;
@@ -1589,7 +1589,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)
                        ret = -ECHILD;
                if (!(flags & LOOKUP_RCU))
                        dput(parent);
-               else if (parent != ACCESS_ONCE(dentry->d_parent))
+               else if (parent != READ_ONCE(dentry->d_parent))
                        return -ECHILD;
                goto out;
        }