2 files changed, 5 insertions, 3 deletions

diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c
index d3a5d4e29ba5..589f4ea9381c 100644
--- a/fs/gfs2/dentry.c
+++ b/fs/gfs2/dentry.c
@@ -93,9 +93,6 @@ invalid_gunlock:
         if (!had_lock)
                 gfs2_glock_dq_uninit(&d_gh);
 invalid:
-        if (check_submounts_and_drop(dentry) != 0)
-                goto valid;
-
         dput(parent);
         return 0;
 
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index fcf42eadb69c..c4ed823d150e 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1245,6 +1245,9 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
         struct dentry *d;
         bool excl = !!(flags & O_EXCL);
 
+        if (!d_unhashed(dentry))
+                goto skip_lookup;
+
         d = __gfs2_lookup(dir, dentry, file, opened);
         if (IS_ERR(d))
                 return PTR_ERR(d);
@@ -1261,6 +1264,8 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
         }
 
         BUG_ON(d != NULL);
+
+skip_lookup:
         if (!(flags & O_CREAT))
                 return -ENOENT;