diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-04-13 11:40:16 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-04-13 11:40:16 +1000 |
| commit | 6a63ef064b2444883ce8b68b0779d0c739d27204 (patch) | |
| tree | 03414baf93943556fc492e041a389b1c9a671b6a /fs/xfs/xfs_file.c | |
| parent | a448f8f1b744611fb1867ea811170cca2a9a6588 (diff) | |
| parent | 21c3ea18819b5f650c75f59a0457415bc05d2b17 (diff) | |
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index dc5f609bea88..c203839cd5be 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -559,7 +559,7 @@ restart: if (error) return error; - error = xfs_break_layouts(inode, iolock); + error = xfs_break_layouts(inode, iolock, true); if (error) return error; @@ -848,7 +848,7 @@ xfs_file_fallocate( return -EOPNOTSUPP; xfs_ilock(ip, iolock); - error = xfs_break_layouts(inode, &iolock); + error = xfs_break_layouts(inode, &iolock, false); if (error) goto out_unlock; |