Commit 9a41fe34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  reiserfs: fix j_last_flush_trans_id type
  fs: Mark get_filesystem_list() as __init function.
  kill vfs_stat_fd / vfs_lstat_fd
  Separate out common fstatat code into vfs_fstatat
  ecryptfs: use memdup_user()
  ncpfs: use memdup_user()
  xfs: use memdup_user()
  sysfs: use memdup_user()
  btrfs: use memdup_user()
  xattr: use memdup_user()
  autofs4: use memchr() in invalid_string()
  Documentation/filesystems: remove out of date reference to BKL being held
  Fix i_mutex vs. readdir handling in nfsd
  fs/compat_ioctl: fix build when !BLOCK
  Fix autofs_expire()
  No need for crossing to mountpoint in audit_tag_tree()
  Safer nfsd_cross_mnt()
  Touch all affected namespaces on propagation of mount
  Fix AUTOFS_DEV_IOCTL_REQUESTER_CMD
parents 8b9cf76d be9208df

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ or bottom half). 
  unfreeze_fs: called when VFS is unlocking a filesystem and making it writable

  	again.



  statfs: called when the VFS needs to get filesystem statistics. This

	is called with the kernel lock held

  statfs: called when the VFS needs to get filesystem statistics.



  remount_fs: called when the filesystem is remounted. This is called

	with the kernel lock held

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);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE