summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_file.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-04-13 11:38:29 +1000
committerDave Chinner <david@fromorbit.com>2015-04-13 11:38:29 +1000
commit21c3ea18819b5f650c75f59a0457415bc05d2b17 (patch)
tree4a6ffaa3bed47bc57441c3ffe9d2f1e55a8b197d /fs/xfs/xfs_file.c
parent66db8104968ad8c0bf5a45a100ae586ddfadc1e1 (diff)
downloadop-kernel-dev-21c3ea18819b5f650c75f59a0457415bc05d2b17.zip
op-kernel-dev-21c3ea18819b5f650c75f59a0457415bc05d2b17.tar.gz
xfs: unlock i_mutex in xfs_break_layouts
We want to drop all I/O path locks when recalling layouts, and that includes i_mutex for the write path. Without this we get stuck processe when recalls take too long. [dchinner: fix build with !CONFIG_PNFS] Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_file.c')
-rw-r--r--fs/xfs/xfs_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index edeaccc..f63aedd 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -555,7 +555,7 @@ restart:
if (error)
return error;
- error = xfs_break_layouts(inode, iolock);
+ error = xfs_break_layouts(inode, iolock, true);
if (error)
return error;
@@ -842,7 +842,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;
OpenPOWER on IntegriCloud