]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
statx: switch to CLASS(filename_maybe_null)
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 14 Dec 2025 08:18:33 +0000 (03:18 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 16 Jan 2026 17:52:04 +0000 (12:52 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/stat.c

index d18577f3688cd6a6b98056c2c886e5139e932b52..89909746bed19e9e9f38bb7905b0028512d73b71 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -365,17 +365,13 @@ retry:
 int vfs_fstatat(int dfd, const char __user *filename,
                              struct kstat *stat, int flags)
 {
-       int ret;
-       int statx_flags = flags | AT_NO_AUTOMOUNT;
-       struct filename *name = getname_maybe_null(filename, flags);
+       CLASS(filename_maybe_null, name)(filename, flags);
 
        if (!name && dfd >= 0)
                return vfs_fstat(dfd, stat);
 
-       ret = vfs_statx(dfd, name, statx_flags, stat, STATX_BASIC_STATS);
-       putname(name);
-
-       return ret;
+       return vfs_statx(dfd, name, flags | AT_NO_AUTOMOUNT,
+                        stat, STATX_BASIC_STATS);
 }
 
 #ifdef __ARCH_WANT_OLD_STAT
@@ -810,16 +806,12 @@ SYSCALL_DEFINE5(statx,
                unsigned int, mask,
                struct statx __user *, buffer)
 {
-       int ret;
-       struct filename *name = getname_maybe_null(filename, flags);
+       CLASS(filename_maybe_null, name)(filename, flags);
 
        if (!name && dfd >= 0)
                return do_statx_fd(dfd, flags & ~AT_NO_AUTOMOUNT, mask, buffer);
 
-       ret = do_statx(dfd, name, flags, mask, buffer);
-       putname(name);
-
-       return ret;
+       return do_statx(dfd, name, flags, mask, buffer);
 }
 
 #if defined(CONFIG_COMPAT) && defined(__ARCH_WANT_COMPAT_STAT)