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

Conflicts: fs/xfs/xfs_iops.c
2015-04-13 11:40:16 +10:00
parent a448f8f1b7 21c3ea1881
commit 6a63ef064b
12 changed files with 159 additions and 51 deletions
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -639,7 +639,7 @@ xfs_ioc_space(
 		return error;

 	xfs_ilock(ip, iolock);
-	error = xfs_break_layouts(inode, &iolock);
+	error = xfs_break_layouts(inode, &iolock, false);
 	if (error)
 		goto out_unlock;