io_uring: end waiting before task cancel attempts

[linux-2.6-microblaze.git] / fs / stat.c

diff --git a/fs/stat.c b/fs/stat.c
index 44f8ad3..dacecdd 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -56,7 +56,7 @@ EXPORT_SYMBOL(generic_fillattr);
  * @path: file to get attributes from
  * @stat: structure to return attributes in
  * @request_mask: STATX_xxx flags indicating what the caller wants
- * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
+ * @query_flags: Query mode (AT_STATX_SYNC_TYPE)
  *
  * Get attributes without calling security_inode_getattr.
  *
@@ -71,7 +71,7 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
 
        memset(stat, 0, sizeof(*stat));
        stat->result_mask |= STATX_BASIC_STATS;
-       query_flags &= KSTAT_QUERY_FLAGS;
+       query_flags &= AT_STATX_SYNC_TYPE;
 
        /* allow the fs to override these if it really wants to */
        /* SB_NOATIME means filesystem supplies dummy atime value */
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(vfs_getattr_nosec);
  * @path: The file of interest
  * @stat: Where to return the statistics
  * @request_mask: STATX_xxx flags indicating what the caller wants
- * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
+ * @query_flags: Query mode (AT_STATX_SYNC_TYPE)
  *
  * Ask the filesystem for a file's attributes.  The caller must indicate in
  * request_mask and query_flags to indicate what they want.
@@ -126,53 +126,27 @@ int vfs_getattr(const struct path *path, struct kstat *stat,
 EXPORT_SYMBOL(vfs_getattr);
 
 /**
- * vfs_statx_fd - Get the enhanced basic attributes by file descriptor
+ * vfs_fstat - Get the basic attributes by file descriptor
  * @fd: The file descriptor referring to the file of interest
  * @stat: The result structure to fill in.
- * @request_mask: STATX_xxx flags indicating what the caller wants
- * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
  *
  * This function is a wrapper around vfs_getattr().  The main difference is
  * that it uses a file descriptor to determine the file location.
  *
  * 0 will be returned on success, and a -ve error code if unsuccessful.
  */
-int vfs_statx_fd(unsigned int fd, struct kstat *stat,
-                u32 request_mask, unsigned int query_flags)
+int vfs_fstat(int fd, struct kstat *stat)
 {
        struct fd f;
-       int error = -EBADF;
-
-       if (query_flags & ~KSTAT_QUERY_FLAGS)
-               return -EINVAL;
+       int error;
 
        f = fdget_raw(fd);
-       if (f.file) {
-               error = vfs_getattr(&f.file->f_path, stat,
-                                   request_mask, query_flags);
-               fdput(f);
-       }
+       if (!f.file)
+               return -EBADF;
+       error = vfs_getattr(&f.file->f_path, stat, STATX_BASIC_STATS, 0);
+       fdput(f);
        return error;
 }
-EXPORT_SYMBOL(vfs_statx_fd);
-
-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
@@ -189,15 +163,24 @@ static inline unsigned vfs_stat_set_lookup_flags(unsigned *lookup_flags,
  *
  * 0 will be returned on success, and a -ve error code if unsuccessful.
  */
-int vfs_statx(int dfd, const char __user *filename, int flags,
+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 |
+                     AT_STATX_SYNC_TYPE))
                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)
@@ -217,8 +200,13 @@ retry:
 out:
        return error;
 }
-EXPORT_SYMBOL(vfs_statx);
 
+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);
+}
 
 #ifdef __ARCH_WANT_OLD_STAT