Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f362f98e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue: (21 commits)
  leases: fix write-open/read-lease race
  nfs: drop unnecessary locking in llseek
  ext4: replace cut'n'pasted llseek code with generic_file_llseek_size
  vfs: add generic_file_llseek_size
  vfs: do (nearly) lockless generic_file_llseek
  direct-io: merge direct_io_walker into __blockdev_direct_IO
  direct-io: inline the complete submission path
  direct-io: separate map_bh from dio
  direct-io: use a slab cache for struct dio
  direct-io: rearrange fields in dio/dio_submit to avoid holes
  direct-io: fix a wrong comment
  direct-io: separate fields only used in the submission path from struct dio
  vfs: fix spinning prevention in prune_icache_sb
  vfs: add a comment to inode_permission()
  vfs: pass all mask flags check_acl and posix_acl_permission
  vfs: add hex format for MAY_* flag values
  vfs: indicate that the permission functions take all the MAY_* flags
  compat: sync compat_stats with statfs.
  vfs: add "device" tag to /proc/self/mountstats
  cleanup: vfs: small comment fix for block_invalidatepage
  ...

Fix up trivial conflict in fs/gfs2/file.c (llseek changes)
parents f793f296 f3c7691e

arch/mips/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ struct compat_statfs { 
	int		f_bavail;

	compat_fsid_t	f_fsid;

	int		f_namelen;

	int		f_spare[6];

	int		f_flags;

	int		f_spare[5];

};



#define COMPAT_RLIM_INFINITY	0x7fffffffUL

arch/parisc/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ struct compat_statfs { 
	__kernel_fsid_t	f_fsid;

	s32		f_namelen;

	s32		f_frsize;

	s32		f_spare[5];

	s32		f_flags;

	s32		f_spare[4];

};



struct compat_sigcontext {

arch/powerpc/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ struct compat_statfs { 
	compat_fsid_t	f_fsid;

	int		f_namelen;	/* SunOS ignores this field. */

	int		f_frsize;

	int		f_spare[5];

	int		f_flags;

	int		f_spare[4];

};



#define COMPAT_RLIM_OLD_INFINITY	0x7fffffff

arch/s390/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ struct compat_statfs { 
	compat_fsid_t	f_fsid;

	s32		f_namelen;

	s32		f_frsize;

	s32		f_spare[6];

	s32		f_flags;

	s32		f_spare[5];

};



#define COMPAT_RLIM_OLD_INFINITY	0x7fffffff

arch/sparc/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ struct compat_statfs { 
	compat_fsid_t	f_fsid;

	int		f_namelen;	/* SunOS ignores this field. */

	int		f_frsize;

	int		f_spare[5];

	int		f_flags;

	int		f_spare[4];

};



#define COMPAT_RLIM_INFINITY 0x7fffffff