Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next

Conflicts:
	fs/xfs/xfs_iops.c

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
index 015d6a3,1d4efee..2f1839e
--- 1/fs/xfs/xfs_iops.c
--- 2/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@@ -953,13 -988,9 +953,13 @@@ xfs_vn_setattr
                uint            iolock = XFS_IOLOCK_EXCL;
  
                xfs_ilock(ip, iolock);
-               error = xfs_break_layouts(dentry->d_inode, &iolock);
+               error = xfs_break_layouts(dentry->d_inode, &iolock, true);
 -              if (!error)
 +              if (!error) {
 +                      xfs_ilock(ip, XFS_MMAPLOCK_EXCL);
 +                      iolock |= XFS_MMAPLOCK_EXCL;
 +
                        error = xfs_setattr_size(ip, iattr);
 +              }
                xfs_iunlock(ip, iolock);
        } else {
                error = xfs_setattr_nonsize(ip, iattr, 0);

diff --cc fs/xfs/xfs_pnfs.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge