From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 20:03:35 +0000 (-0700)
Subject: Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v3.16-rc1~79
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f8409abdc592e13cefbe4e4a24a84b3d5741e85f;p=~emulex%2Finfiniband.git

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:
 "Clean ups and miscellaneous bug fixes, in particular for the new
  collapse_range and zero_range fallocate functions.  In addition,
  improve the scalability of adding and remove inodes from the orphan
  list"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (25 commits)
  ext4: handle symlink properly with inline_data
  ext4: fix wrong assert in ext4_mb_normalize_request()
  ext4: fix zeroing of page during writeback
  ext4: remove unused local variable "stored" from ext4_readdir(...)
  ext4: fix ZERO_RANGE test failure in data journalling
  ext4: reduce contention on s_orphan_lock
  ext4: use sbi in ext4_orphan_{add|del}()
  ext4: use EXT_MAX_BLOCKS in ext4_es_can_be_merged()
  ext4: add missing BUFFER_TRACE before ext4_journal_get_write_access
  ext4: remove unnecessary double parentheses
  ext4: do not destroy ext4_groupinfo_caches if ext4_mb_init() fails
  ext4: make local functions static
  ext4: fix block bitmap validation when bigalloc, ^flex_bg
  ext4: fix block bitmap initialization under sparse_super2
  ext4: find the group descriptors on a 1k-block bigalloc,meta_bg filesystem
  ext4: avoid unneeded lookup when xattr name is invalid
  ext4: fix data integrity sync in ordered mode
  ext4: remove obsoleted check
  ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode
  ext4: fix locking for O_APPEND writes
  ...
---

f8409abdc592e13cefbe4e4a24a84b3d5741e85f
diff --cc fs/ext4/page-io.c
index 1a64e7a52b8,b6a3804a985..b24a2541a9b
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -414,9 -415,23 +415,23 @@@ int ext4_bio_write_page(struct ext4_io_
  	BUG_ON(!PageLocked(page));
  	BUG_ON(PageWriteback(page));
  
- 	set_page_writeback(page);
+ 	if (keep_towrite)
+ 		set_page_writeback_keepwrite(page);
+ 	else
+ 		set_page_writeback(page);
  	ClearPageError(page);
  
+ 	/*
 -	 * Comments copied from block_write_full_page_endio:
++	 * Comments copied from block_write_full_page:
+ 	 *
+ 	 * The page straddles i_size.  It must be zeroed out on each and every
+ 	 * writepage invocation because it may be mmapped.  "A file is mapped
+ 	 * in multiples of the page size.  For a file that is not a multiple of
+ 	 * the page size, the remaining memory is zeroed when mapped, and
+ 	 * writes to that region are not written out to the file."
+ 	 */
+ 	if (len < PAGE_CACHE_SIZE)
+ 		zero_user_segment(page, len, PAGE_CACHE_SIZE);
  	/*
  	 * In the first loop we prepare and mark buffers to submit. We have to
  	 * mark all buffers in the page before submitting so that