fs: remove vfs_stat_set_lookup_flags

[linux-block.git] / fs / stat.c

diff --git a/fs/stat.c b/fs/stat.c
index ddf0176d4dbcd700e3beba5bd9319f1f316b3193..8acc4b14ac24c92f015acd202fea04f05fc25b30 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -148,24 +148,6 @@ int vfs_fstat(int fd, struct kstat *stat)
        return error;
 }
 
-static inline unsigned vfs_stat_set_lookup_flags(unsigned *lookup_flags,
-                                                int flags)
-{
-       if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
-                      AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)
-               return -EINVAL;
-
-       *lookup_flags = LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
-       if (flags & AT_SYMLINK_NOFOLLOW)
-               *lookup_flags &= ~LOOKUP_FOLLOW;
-       if (flags & AT_NO_AUTOMOUNT)
-               *lookup_flags &= ~LOOKUP_AUTOMOUNT;
-       if (flags & AT_EMPTY_PATH)
-               *lookup_flags |= LOOKUP_EMPTY;
-
-       return 0;
-}
-
 /**
  * vfs_statx - Get basic and extra attributes by filename
  * @dfd: A file descriptor representing the base dir for a relative filename
@@ -185,11 +167,20 @@ static int vfs_statx(int dfd, const char __user *filename, int flags,
              struct kstat *stat, u32 request_mask)
 {
        struct path path;
-       int error = -EINVAL;
-       unsigned lookup_flags;
+       unsigned lookup_flags = 0;
+       int error;
 
-       if (vfs_stat_set_lookup_flags(&lookup_flags, flags))
+       if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_EMPTY_PATH |
+                     KSTAT_QUERY_FLAGS))
                return -EINVAL;
+
+       if (!(flags & AT_SYMLINK_NOFOLLOW))
+               lookup_flags |= LOOKUP_FOLLOW;
+       if (!(flags & AT_NO_AUTOMOUNT))
+               lookup_flags |= LOOKUP_AUTOMOUNT;
+       if (flags & AT_EMPTY_PATH)
+               lookup_flags |= LOOKUP_EMPTY;
+
 retry:
        error = user_path_at(dfd, filename, lookup_flags, &path);
        if (error)