From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Nov 2015 04:18:48 +0000 (-0800)
Subject: Merge tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc... 
X-Git-Tag: firefly_0821_release~176^2~707
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5d50ac70fe98518dbf620bfba8184254663125eb;p=firefly-linux-kernel-4.4.55.git

Merge tag 'xfs-for-linus-4.4' of git://git./linux/kernel/git/dgc/linux-xfs

Pull xfs updates from Dave Chinner:
 "There is nothing really major here - the only significant addition is
  the per-mount operation statistics infrastructure.  Otherwises there's
  various ACL, xattr, DAX, AIO and logging fixes, and a smattering of
  small cleanups and fixes elsewhere.

  Summary:

   - per-mount operational statistics in sysfs
   - fixes for concurrent aio append write submission
   - various logging fixes
   - detection of zeroed logs and invalid log sequence numbers on v5 filesystems
   - memory allocation failure message improvements
   - a bunch of xattr/ACL fixes
   - fdatasync optimisation
   - miscellaneous other fixes and cleanups"

* tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (39 commits)
  xfs: give all workqueues rescuer threads
  xfs: fix log recovery op header validation assert
  xfs: Fix error path in xfs_get_acl
  xfs: optimise away log forces on timestamp updates for fdatasync
  xfs: don't leak uuid table on rmmod
  xfs: invalidate cached acl if set via ioctl
  xfs: Plug memory leak in xfs_attrmulti_attr_set
  xfs: Validate the length of on-disk ACLs
  xfs: invalidate cached acl if set directly via xattr
  xfs: xfs_filemap_pmd_fault treats read faults as write faults
  xfs: add ->pfn_mkwrite support for DAX
  xfs: DAX does not use IO completion callbacks
  xfs: Don't use unwritten extents for DAX
  xfs: introduce BMAPI_ZERO for allocating zeroed extents
  xfs: fix inode size update overflow in xfs_map_direct()
  xfs: clear PF_NOFREEZE for xfsaild kthread
  xfs: fix an error code in xfs_fs_fill_super()
  xfs: stats are no longer dependent on CONFIG_PROC_FS
  xfs: simplify /proc teardown & error handling
  xfs: per-filesystem stats counter implementation
  ...
---

5d50ac70fe98518dbf620bfba8184254663125eb
diff --cc fs/xfs/xfs_file.c
index f80e90f95ad8,39743efae795..f5392ab2def1
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -1503,10 -1519,9 +1519,9 @@@ xfs_filemap_page_mkwrite
  	xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
  
  	if (IS_DAX(inode)) {
- 		ret = __dax_mkwrite(vma, vmf, xfs_get_blocks_direct,
- 				    xfs_end_io_dax_write);
+ 		ret = __dax_mkwrite(vma, vmf, xfs_get_blocks_dax_fault, NULL);
  	} else {
 -		ret = __block_page_mkwrite(vma, vmf, xfs_get_blocks);
 +		ret = block_page_mkwrite(vma, vmf, xfs_get_blocks);
  		ret = block_page_mkwrite_return(ret);
  	}