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

Commit 5166701b 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 

Pull vfs updates from Al Viro:
 "The first vfs pile, with deep apologies for being very late in this
  window.

  Assorted cleanups and fixes, plus a large preparatory part of iov_iter
  work.  There's a lot more of that, but it'll probably go into the next
  merge window - it *does* shape up nicely, removes a lot of
  boilerplate, gets rid of locking inconsistencie between aio_write and
  splice_write and I hope to get Kent's direct-io rewrite merged into
  the same queue, but some of the stuff after this point is having
  (mostly trivial) conflicts with the things already merged into
  mainline and with some I want more testing.

  This one passes LTP and xfstests without regressions, in addition to
  usual beating.  BTW, readahead02 in ltp syscalls testsuite has started
  giving failures since "mm/readahead.c: fix readahead failure for
  memoryless NUMA nodes and limit readahead pages" - might be a false
  positive, might be a real regression..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  missing bits of "splice: fix racy pipe->buffers uses"
  cifs: fix the race in cifs_writev()
  ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
  kill generic_file_buffered_write()
  ocfs2_file_aio_write(): switch to generic_perform_write()
  ceph_aio_write(): switch to generic_perform_write()
  xfs_file_buffered_aio_write(): switch to generic_perform_write()
  export generic_perform_write(), start getting rid of generic_file_buffer_write()
  generic_file_direct_write(): get rid of ppos argument
  btrfs_file_aio_write(): get rid of ppos
  kill the 5th argument of generic_file_buffered_write()
  kill the 4th argument of __generic_file_aio_write()
  lustre: don't open-code kernel_recvmsg()
  ocfs2: don't open-code kernel_recvmsg()
  drbd: don't open-code kernel_recvmsg()
  constify blk_rq_map_user_iov() and friends
  lustre: switch to kernel_sendmsg()
  ocfs2: don't open-code kernel_sendmsg()
  take iov_iter stuff to mm/iov_iter.c
  process_vm_access: tidy up a bit
  ...
parents 0a7418f5 a786c06d

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ prototypes: 
				unsigned long *);

	int (*migratepage)(struct address_space *, struct page *, struct page *);

	int (*launder_page)(struct page *);

	int (*is_partially_uptodate)(struct page *, read_descriptor_t *, unsigned long);

	int (*is_partially_uptodate)(struct page *, unsigned long, unsigned long);

	int (*error_remove_page)(struct address_space *, struct page *);

	int (*swap_activate)(struct file *);

	int (*swap_deactivate)(struct file *);

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ struct address_space_operations { 
	/* migrate the contents of a page to the specified target */

	int (*migratepage) (struct page *, struct page *);

	int (*launder_page) (struct page *);

	int (*is_partially_uptodate) (struct page *, read_descriptor_t *,

	int (*is_partially_uptodate) (struct page *, unsigned long,

					unsigned long);

	void (*is_dirty_writeback) (struct page *, bool *, bool *);

	int (*error_remove_page) (struct mapping *mapping, struct page *page);

arch/mn10300/include/asm/highmem.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static inline void kunmap(struct page *page) 
 * be used in IRQ contexts, so in some (very limited) cases we need

 * it.

 */

static inline unsigned long kmap_atomic(struct page *page)

static inline void *kmap_atomic(struct page *page)

{

	unsigned long vaddr;

	int idx, type;
@@ -89,7 +89,7 @@ static inline unsigned long kmap_atomic(struct page *page) 
	set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));

	local_flush_tlb_one(vaddr);



	return vaddr;

	return (void *)vaddr;

}



static inline void __kunmap_atomic(unsigned long vaddr)

arch/powerpc/configs/ppc6xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y 
CONFIG_DEBUG_HIGHMEM=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_WRITECOUNT=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_SG=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

arch/powerpc/configs/ps3_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_PROVE_LOCKING=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_WRITECOUNT=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_LIST=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60