1 files changed, 4 insertions, 20 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 0432f474771b..e6d55dc93ffd 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1366,24 +1366,6 @@ const struct dentry_operations nfs4_dentry_operations = {
         .d_release      = nfs_d_release,
 };
 
-/*
- * Use intent information to determine whether we need to substitute
- * the NFSv4-style stateful OPEN for the LOOKUP call
- */
-static int is_atomic_open(struct nameidata *nd)
-{
-        if (nd == NULL || nfs_lookup_check_intent(nd, LOOKUP_OPEN) == 0)
-                return 0;
-        /* NFS does not (yet) have a stateful open for directories */
-        if (nd->flags & LOOKUP_DIRECTORY)
-                return 0;
-        /* Are we trying to write to a read only partition? */
-        if (__mnt_is_readonly(nd->path.mnt) &&
-            (nd->intent.open.flags & (O_CREAT|O_TRUNC|O_ACCMODE)))
-                return 0;
-        return 1;
-}
-
 static fmode_t flags_to_mode(int flags)
 {
         fmode_t res = (__force fmode_t)flags & FMODE_EXEC;
@@ -1543,10 +1525,12 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
         if (nd->flags & LOOKUP_RCU)
                 return -ECHILD;
 
-        inode = dentry->d_inode;
-        if (!is_atomic_open(nd) || d_mountpoint(dentry))
+        if (!(nd->flags & LOOKUP_OPEN) || (nd->flags & LOOKUP_DIRECTORY))
+                goto no_open;
+        if (d_mountpoint(dentry))
                 goto no_open;
 
+        inode = dentry->d_inode;
         parent = dget_parent(dentry);
         dir = parent->d_inode;