summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_iops.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-04-13 01:40:16 (GMT)
committerDave Chinner <david@fromorbit.com>2015-04-13 01:40:16 (GMT)
commit6a63ef064b2444883ce8b68b0779d0c739d27204 (patch)
tree03414baf93943556fc492e041a389b1c9a671b6a /fs/xfs/xfs_iops.c
parenta448f8f1b744611fb1867ea811170cca2a9a6588 (diff)
parent21c3ea18819b5f650c75f59a0457415bc05d2b17 (diff)
downloadlinux-6a63ef064b2444883ce8b68b0779d0c739d27204.tar.xz
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
Conflicts: fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_iops.c')
-rw-r--r--fs/xfs/xfs_iops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 015d6a3..2f1839e 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -953,7 +953,7 @@ 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) {
xfs_ilock(ip, XFS_MMAPLOCK_EXCL);
iolock |= XFS_MMAPLOCK_EXCL;