From: Dave Chinner <david@fromorbit.com>
Date: Mon, 13 Apr 2015 01:40:16 +0000 (+1000)
Subject: Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a63ef064b2444883ce8b68b0779d0c739d27204;p=linux-beck.git

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

Conflicts:
	fs/xfs/xfs_iops.c
---

6a63ef064b2444883ce8b68b0779d0c739d27204
diff --cc fs/xfs/xfs_iops.c
index 015d6a366b16,1d4efee4be17..2f1839e4dd1b
--- a/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);