diff options
| author | Christoph Hellwig <hch@infradead.org> | 2009-07-18 18:15:00 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-08-12 01:07:53 -0500 |
| commit | 7b02ecb3031b192823bc732ae717febc0a59aa92 (patch) | |
| tree | aeb5e3c56f4634ad3b391dd8a7eab1fce81f0eea | |
| parent | 10746e47e722b5688fcd6eba9fbf9b2e64a248a7 (diff) | |
| download | blackbird-op-linux-7b02ecb3031b192823bc732ae717febc0a59aa92.tar.gz blackbird-op-linux-7b02ecb3031b192823bc732ae717febc0a59aa92.zip | |
xfs: switch to NOFS allocation under i_lock in xfs_readlink_bmap
xfs_readlink_bmap is called with i_lock held, but i_lock is taken in
reclaim context so all allocations under it must avoid recursions into
the filesystem.
Reported by the new reclaim context tracing in lockdep.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index c4eca5ed5dab..492d75bae2bf 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -538,7 +538,9 @@ xfs_readlink_bmap( d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); - bp = xfs_buf_read(mp->m_ddev_targp, d, BTOBB(byte_cnt), 0); + bp = xfs_buf_read_flags(mp->m_ddev_targp, d, BTOBB(byte_cnt), + XBF_LOCK | XBF_MAPPED | + XBF_DONT_BLOCK); error = XFS_BUF_GETERROR(bp); if (error) { xfs_ioerror_alert("xfs_readlink", |
