2 files changed, 13 insertions, 5 deletions

diff --git a/fs/namei.c b/fs/namei.c
index ddb6a7c2b3d4..1180f9c58093 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1129,9 +1129,18 @@ static int follow_automount(struct path *path, struct nameidata *nd,
          * of the daemon to instantiate them before they can be used.
          */
         if (!(nd->flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY |
-                           LOOKUP_OPEN | LOOKUP_CREATE | LOOKUP_AUTOMOUNT)) &&
-            path->dentry->d_inode)
-                return -EISDIR;
+                           LOOKUP_OPEN | LOOKUP_CREATE |
+                           LOOKUP_AUTOMOUNT))) {
+                /* Positive dentry that isn't meant to trigger an
+                 * automount, EISDIR will allow it to be used,
+                 * otherwise there's no mount here "now" so return
+                 * ENOENT.
+                 */
+                if (path->dentry->d_inode)
+                        return -EISDIR;
+                else
+                        return -ENOENT;
+        }
 
         if (path->dentry->d_sb->s_user_ns != &init_user_ns)
                 return -EACCES;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6111976848ff..2d0e6748e46e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3043,8 +3043,7 @@ static inline int vfs_lstat(const char __user *name, struct kstat *stat)
 static inline int vfs_fstatat(int dfd, const char __user *filename,
                               struct kstat *stat, int flags)
 {
-        return vfs_statx(dfd, filename, flags | AT_NO_AUTOMOUNT,
-                         stat, STATX_BASIC_STATS);
+        return vfs_statx(dfd, filename, flags, stat, STATX_BASIC_STATS);
 }
 static inline int vfs_fstat(int fd, struct kstat *stat)
 {