Commit 0112fc22 authored by Oleg Drokin's avatar Oleg Drokin Committed by Al Viro
Browse files

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: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent fd56d242

arch/arm/kernel/sys_oabi-compat.c

+5 −14
Original line number Diff line number Diff line
@@ -177,21 +177,12 @@ asmlinkage long sys_oabi_fstatat64(int dfd, 
				   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:

	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
Original line number Diff line number Diff line
@@ -702,20 +702,12 @@ asmlinkage long sys32_fstatat64(unsigned int dfd, char __user *filename, 
				struct stat64_emu31 __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);

	int error;



	if (!error)

		error = cp_stat64(statbuf, &stat);

out:

	error = vfs_fstatat(dfd, filename, &stat, flag);

	if (error)

		return error;

	return cp_stat64(statbuf, &stat);

}



/*

arch/sparc/kernel/sys_sparc32.c

+5 −14
Original line number Diff line number Diff line
@@ -206,21 +206,12 @@ asmlinkage long compat_sys_fstatat64(unsigned int dfd, char __user *filename, 
		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:

	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
Original line number Diff line number Diff line
@@ -129,21 +129,12 @@ asmlinkage long sys32_fstatat(unsigned int dfd, char __user *filename, 
			      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:

	error = vfs_fstatat(dfd, filename, &stat, flag);

	if (error)

		return error;

	return cp_stat64(statbuf, &stat);

}



/*

fs/compat.c

+5 −14
Original line number Diff line number Diff line
@@ -204,21 +204,12 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename, 
		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:

	error = vfs_fstatat(dfd, filename, &stat, flag);

	if (error)

		return error;

	return cp_compat_stat(&stat, statbuf);

}

#endif