]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fs/stat.c: switch to CLASS(fd_raw)
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 20 Oct 2024 00:48:30 +0000 (20:48 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 13 Nov 2024 16:46:14 +0000 (11:46 -0500)
... and use fd_empty() consistently

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/stat.c

index 4e8698fa932f8471fadc01d0ca8440a2dc23dec7..855b995ad09bd8c79ade51f9eb7a279628f2e293 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -220,15 +220,10 @@ EXPORT_SYMBOL(vfs_getattr);
  */
 int vfs_fstat(int fd, struct kstat *stat)
 {
-       struct fd f;
-       int error;
-
-       f = fdget_raw(fd);
-       if (!fd_file(f))
+       CLASS(fd_raw, f)(fd);
+       if (fd_empty(f))
                return -EBADF;
-       error = vfs_getattr(&fd_file(f)->f_path, stat, STATX_BASIC_STATS, 0);
-       fdput(f);
-       return error;
+       return vfs_getattr(&fd_file(f)->f_path, stat, STATX_BASIC_STATS, 0);
 }
 
 static int statx_lookup_flags(int flags)
@@ -275,7 +270,7 @@ static int vfs_statx_fd(int fd, int flags, struct kstat *stat,
                          u32 request_mask)
 {
        CLASS(fd_raw, f)(fd);
-       if (!fd_file(f))
+       if (fd_empty(f))
                return -EBADF;
        return vfs_statx_path(&fd_file(f)->f_path, flags, stat, request_mask);
 }