Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b02ecb3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Felix Blyakher
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
parent 10746e47

fs/xfs/xfs_vnodeops.c

+3 −1
Original line number Diff line number Diff line
@@ -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",