Separate out common fstatat code into vfs_fstatat
Subsystems (5)
PATCH 1/1 Separate out common fstatat code into vfs_fstatat
This is a version incorporating Christoph's suggestion.
Separate out common *fstatat functionality into a single function instead of duplicating it all over the code.
Signed-off-by Oleg Drokin <[email protected]>
arch/arm/kernel/sys_oabi-compat.c | 19 +++--------- arch/s390/kernel/compat_linux.c | 18 +++--------- arch/sparc/kernel/sys_sparc32.c | 19 +++--------- arch/x86/ia32/sys_ia32.c | 19 +++--------- fs/compat.c | 19 +++--------- fs/stat.c | 56 +++++++++++++++++++------------------- include/linux/fs.h | 1 7 files changed, 54 insertions(+), 97 deletions(-)
arch/arm/kernel/sys_oabi-compat.c +5 -14
@@ -176,21 +176,12 @@ int flag) {struct kstat stat; -int error = -EINVAL ; +int error; -if ((flag & ~AT_SYMLINK_NOFOLLOW ) !=0 ) - goto out; - -if (flag &AT_SYMLINK_NOFOLLOW ) - error =vfs_lstat_fd (dfd, filename, &stat); -else - error =vfs_stat_fd (dfd, filename, &stat); - -if (!error) - error =cp_oldabi_stat64 (&stat, statbuf); - -out: -return error; + error =vfs_fstatat (dfd, filename, &stat, flag); +if (error) +return error; +return cp_oldabi_stat64 (&stat, statbuf); }struct oabi_flock64 {
arch/s390/kernel/compat_linux.c +5 -13
@@ -702,20 +702,12 @@ struct stat64_emu31 __user* statbuf, int flag) {struct kstat stat; -int error = -EINVAL ; +int error; -if ((flag & ~AT_SYMLINK_NOFOLLOW ) !=0 ) - goto out; - -if (flag &AT_SYMLINK_NOFOLLOW ) - error =vfs_lstat_fd (dfd, filename, &stat); -else - error =vfs_stat_fd (dfd, filename, &stat); - -if (!error) - error =cp_stat64 (statbuf, &stat); -out: -return error; + error =vfs_fstatat (dfd, filename, &stat, flag); +if (error) +return error; +return cp_stat64 (statbuf, &stat); }/*
arch/sparc/kernel/sys_sparc32.c +5 -14
@@ -206,21 +206,12 @@ struct compat_stat64 __user * statbuf, int flag) {struct kstat stat; -int error = -EINVAL ; - -if ((flag & ~AT_SYMLINK_NOFOLLOW ) !=0 ) - goto out; - -if (flag &AT_SYMLINK_NOFOLLOW ) - error =vfs_lstat_fd (dfd, filename, &stat); -else - error =vfs_stat_fd (dfd, filename, &stat); - -if (!error) - error =cp_compat_stat64 (&stat, statbuf); +int error; -out: -return error; + error =vfs_fstatat (dfd, filename, &stat, flag); +if (error) +return error; +return cp_compat_stat64 (&stat, statbuf); }asmlinkage long compat_sys_sysfs (int option,u32 arg1,u32 arg2)
arch/x86/ia32/sys_ia32.c +5 -14
@@ -129,21 +129,12 @@ struct stat64 __user *statbuf, int flag) {struct kstat stat; -int error = -EINVAL ; +int error; -if ((flag & ~AT_SYMLINK_NOFOLLOW ) !=0 ) - goto out; - -if (flag &AT_SYMLINK_NOFOLLOW ) - error =vfs_lstat_fd (dfd, filename, &stat); -else - error =vfs_stat_fd (dfd, filename, &stat); - -if (!error) - error =cp_stat64 (statbuf, &stat); - -out: -return error; + error =vfs_fstatat (dfd, filename, &stat, flag); +if (error) +return error; +return cp_stat64 (statbuf, &stat); }/*
fs/compat.c +5 -14
@@ -203,21 +203,12 @@ struct compat_stat __user *statbuf, int flag) {struct kstat stat; -int error = -EINVAL ; - -if ((flag & ~AT_SYMLINK_NOFOLLOW ) !=0 ) - goto out; - -if (flag &AT_SYMLINK_NOFOLLOW ) - error =vfs_lstat_fd (dfd, filename, &stat); -else - error =vfs_stat_fd (dfd, filename, &stat); - -if (!error) - error =cp_compat_stat (&stat, statbuf); +int error; -out: -return error; + error =vfs_fstatat (dfd, filename, &stat, flag); +if (error) +return error; +return cp_compat_stat (&stat, statbuf); }#endif
fs/stat.c +28 -28
76 lines not on this page · raw message
include/linux/fs.h +1 -0
@@ -2075,6 +2075,7 @@extern int vfs_stat_fd (int dfd,char __user *,struct kstat *);extern int vfs_lstat_fd (int dfd,char __user *,struct kstat *);extern int vfs_fstat (unsigned int ,struct kstat *); +extern int vfs_fstatat (int ,char __user *,struct kstat *,int );extern int do_vfs_ioctl (struct file *filp,unsigned int fd,unsigned int cmd,unsigned long arg);
Quoted 4 lines · Oleg Drokin
This is a version incorporating Christoph's suggestion.
Separate out common *fstatat functionality into a single function instead of duplicating it all over the code.
Looks good to me.
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 1/1 kill vfs_stat_fd / vfs_lstat_fd
In reply to Oleg DrokinThere's really no reason to keep vfs_stat_fd and vfs_lstat_fd with Oleg's vfs_fstatat. Use vfs_fstatat for the few cases having the directory fd, and switch all others to vfs_stat / vfs_lstat.
Reviewed-by Christoph Hellwig <[email protected]>
fs/compat.c +10 -8
@@ -180,22 +180,24 @@ asmlinkage long compat_sys_newstat(char struct compat_stat __user *statbuf) {struct kstat stat; -int error =vfs_stat_fd (AT_FDCWD , filename, &stat); +int error; -if (!error) - error =cp_compat_stat (&stat, statbuf); -return error; + error = = vfs_stat(filename, &stat); +if (error) +return error; +return cp_compat_stat (&stat, statbuf); }asmlinkage long compat_sys_newlstat (char __user * filename,struct compat_stat __user *statbuf) {struct kstat stat; -int error =vfs_lstat_fd (AT_FDCWD , filename, &stat); +int error; -if (!error) - error =cp_compat_stat (&stat, statbuf); -return error; + error =vfs_lstat (filename, &stat); +if (error) +return error; +return cp_compat_stat (&stat, statbuf); }#ifndef __ARCH_WANT_STAT64
fs/stat.c +42 -63
160 lines not on this page · raw message
include/linux/fs.h +0 -2
@@ -2223,8 +2223,6 @@ extern int vfs_readdir(struct file *, fiextern int vfs_stat (char __user *,struct kstat *);extern int vfs_lstat (char __user *,struct kstat *); -extern int vfs_stat_fd (int dfd,char __user *,struct kstat *); -extern int vfs_lstat_fd (int dfd,char __user *,struct kstat *);extern int vfs_fstat (unsigned int ,struct kstat *);extern int vfs_fstatat (int ,char __user *,struct kstat *,int );