redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

xfs: unlock i_mutex in xfs_break_layouts

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2015-04-13 11:38:29 +10:00 committed by Dave Chinner
parent 66db810496
commit 21c3ea1881
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/xfs/xfs_file.c
View file

@ -555,7 +555,7 @@ restart:
if (error) if (error)
return error; return error;
error = xfs_break_layouts(inode, iolock); error = xfs_break_layouts(inode, iolock, true);
if (error) if (error)
return error; return error;
@ -842,7 +842,7 @@ xfs_file_fallocate(
return -EOPNOTSUPP; return -EOPNOTSUPP;
xfs_ilock(ip, iolock); xfs_ilock(ip, iolock);
error = xfs_break_layouts(inode, &iolock); error = xfs_break_layouts(inode, &iolock, false);
if (error) if (error)
goto out_unlock; goto out_unlock;

2
fs/xfs/xfs_ioctl.c
View file

@ -639,7 +639,7 @@ xfs_ioc_space(
return error; return error;
xfs_ilock(ip, iolock); xfs_ilock(ip, iolock);
error = xfs_break_layouts(inode, &iolock); error = xfs_break_layouts(inode, &iolock, false);
if (error) if (error)
goto out_unlock; goto out_unlock;

2
fs/xfs/xfs_iops.c
View file

@ -988,7 +988,7 @@ xfs_vn_setattr(
uint iolock = XFS_IOLOCK_EXCL; uint iolock = XFS_IOLOCK_EXCL;
xfs_ilock(ip, iolock); xfs_ilock(ip, iolock);
error = xfs_break_layouts(dentry->d_inode, &iolock); error = xfs_break_layouts(dentry->d_inode, &iolock, true);
if (!error) if (!error)
error = xfs_setattr_size(ip, iattr); error = xfs_setattr_size(ip, iattr);
xfs_iunlock(ip, iolock); xfs_iunlock(ip, iolock);

7
fs/xfs/xfs_pnfs.c
View file

@ -31,7 +31,8 @@
int int
xfs_break_layouts( xfs_break_layouts(
struct inode *inode, struct inode *inode,
uint *iolock) uint *iolock,
bool with_imutex)
{ {
struct xfs_inode *ip = XFS_I(inode); struct xfs_inode *ip = XFS_I(inode);
int error; int error;
@ -40,8 +41,12 @@ xfs_break_layouts(
while ((error = break_layout(inode, false) == -EWOULDBLOCK)) { while ((error = break_layout(inode, false) == -EWOULDBLOCK)) {
xfs_iunlock(ip, *iolock); xfs_iunlock(ip, *iolock);
if (with_imutex && (*iolock & XFS_IOLOCK_EXCL))
mutex_unlock(&inode->i_mutex);
error = break_layout(inode, true); error = break_layout(inode, true);
*iolock = XFS_IOLOCK_EXCL; *iolock = XFS_IOLOCK_EXCL;
if (with_imutex)
mutex_lock(&inode->i_mutex);
xfs_ilock(ip, *iolock); xfs_ilock(ip, *iolock);
} }

5
fs/xfs/xfs_pnfs.h
View file

@ -8,9 +8,10 @@ int xfs_fs_map_blocks(struct inode *inode, loff_t offset, u64 length,
int xfs_fs_commit_blocks(struct inode *inode, struct iomap *maps, int nr_maps, int xfs_fs_commit_blocks(struct inode *inode, struct iomap *maps, int nr_maps,
struct iattr *iattr); struct iattr *iattr);
int xfs_break_layouts(struct inode *inode, uint *iolock); int xfs_break_layouts(struct inode *inode, uint *iolock, bool with_imutex);
#else #else
static inline int xfs_break_layouts(struct inode *inode, uint *iolock) static inline int
xfs_break_layouts(struct inode *inode, uint *iolock, bool with_imutex)
{ {
return 0; return 0;
} }