aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/dir.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 1b5f38f48dab..36d921f0c602 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1102,7 +1102,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
1102 int error; 1102 int error;
1103 1103
1104 if (flags & LOOKUP_RCU) { 1104 if (flags & LOOKUP_RCU) {
1105 parent = rcu_dereference(dentry->d_parent); 1105 parent = ACCESS_ONCE(dentry->d_parent);
1106 dir = ACCESS_ONCE(parent->d_inode); 1106 dir = ACCESS_ONCE(parent->d_inode);
1107 if (!dir) 1107 if (!dir)
1108 return -ECHILD; 1108 return -ECHILD;
@@ -1184,7 +1184,7 @@ out_set_verifier:
1184 nfs_advise_use_readdirplus(dir); 1184 nfs_advise_use_readdirplus(dir);
1185 out_valid_noent: 1185 out_valid_noent:
1186 if (flags & LOOKUP_RCU) { 1186 if (flags & LOOKUP_RCU) {
1187 if (parent != rcu_dereference(dentry->d_parent)) 1187 if (parent != ACCESS_ONCE(dentry->d_parent))
1188 return -ECHILD; 1188 return -ECHILD;
1189 } else 1189 } else
1190 dput(parent); 1190 dput(parent);
@@ -1585,7 +1585,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)
1585 struct inode *dir; 1585 struct inode *dir;
1586 1586
1587 if (flags & LOOKUP_RCU) { 1587 if (flags & LOOKUP_RCU) {
1588 parent = rcu_dereference(dentry); 1588 parent = ACCESS_ONCE(dentry->d_parent);
1589 dir = ACCESS_ONCE(parent->d_inode); 1589 dir = ACCESS_ONCE(parent->d_inode);
1590 if (!dir) 1590 if (!dir)
1591 return -ECHILD; 1591 return -ECHILD;
@@ -1599,7 +1599,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)
1599 ret = -ECHILD; 1599 ret = -ECHILD;
1600 if (!(flags & LOOKUP_RCU)) 1600 if (!(flags & LOOKUP_RCU))
1601 dput(parent); 1601 dput(parent);
1602 else if (parent != rcu_dereference(dentry)) 1602 else if (parent != ACCESS_ONCE(dentry->d_parent))
1603 return -ECHILD; 1603 return -ECHILD;
1604 goto out; 1604 goto out;
1605 } 1605 }