From: Christoph Hellwig hch@lst.de
commit 0b2c669 upstream.
Go through vfs_fstatat instead of duplicating the *stat to statx mapping three times.
Signed-off-by: Christoph Hellwig hch@lst.de Signed-off-by: Al Viro viro@zeniv.linux.org.uk
Cc: stable@vger.kernel.org # 4.19.x-5.4.x Signed-off-by: Miao Wang shankerwangmiao@gmail.com Tested-by: Xi Ruoyao xry111@xry111.site --- include/linux/fs.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h index d4f5fcc60744..2db4e5f7d00b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3262,16 +3262,6 @@ extern int iterate_dir(struct file *, struct dir_context *); extern int vfs_statx(int, const char __user *, int, struct kstat *, u32); extern int vfs_statx_fd(unsigned int, struct kstat *, u32, unsigned int);
-static inline int vfs_stat(const char __user *filename, struct kstat *stat) -{ - return vfs_statx(AT_FDCWD, filename, AT_NO_AUTOMOUNT, - stat, STATX_BASIC_STATS); -} -static inline int vfs_lstat(const char __user *name, struct kstat *stat) -{ - return vfs_statx(AT_FDCWD, name, AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT, - stat, STATX_BASIC_STATS); -} static inline int vfs_fstatat(int dfd, const char __user *filename, struct kstat *stat, int flags) { @@ -3283,6 +3273,14 @@ static inline int vfs_fstat(int fd, struct kstat *stat) return vfs_statx_fd(fd, stat, STATX_BASIC_STATS, 0); }
+static inline int vfs_stat(const char __user *filename, struct kstat *stat) +{ + return vfs_fstatat(AT_FDCWD, filename, stat, 0); +} +static inline int vfs_lstat(const char __user *name, struct kstat *stat) +{ + return vfs_fstatat(AT_FDCWD, name, stat, AT_SYMLINK_NOFOLLOW); +}
extern const char *vfs_get_link(struct dentry *, struct delayed_call *); extern int vfs_readlink(struct dentry *, char __user *, int);