diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-04-13 03:40:16 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-04-13 03:40:16 +0200 |
| commit | 6a63ef064b2444883ce8b68b0779d0c739d27204 (patch) | |
| tree | 03414baf93943556fc492e041a389b1c9a671b6a /fs/xfs/xfs_ioctl.c | |
| parent | Merge branch 'fallocate-insert-range' into for-next (diff) | |
| parent | xfs: unlock i_mutex in xfs_break_layouts (diff) | |
| download | linux-6a63ef064b2444883ce8b68b0779d0c739d27204.tar.xz linux-6a63ef064b2444883ce8b68b0779d0c739d27204.zip | |
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 4ee44ddfdfb7..5f4a396f5186 100644 --- 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; |