summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2009-07-18 18:14:59 -0400
committerFelix Blyakher <felixb@sgi.com>2009-08-12 01:07:44 -0500
commit10746e47e722b5688fcd6eba9fbf9b2e64a248a7 (patch)
tree5109c89eed3c087cf5889297881a5dc5d9efd3ce
parent36fae17a648e0aee5d9560514d08477ef48dc87f (diff)
downloadlinux-3.10-10746e47e722b5688fcd6eba9fbf9b2e64a248a7.tar.gz
linux-3.10-10746e47e722b5688fcd6eba9fbf9b2e64a248a7.tar.bz2
linux-3.10-10746e47e722b5688fcd6eba9fbf9b2e64a248a7.zip
xfs: switch to NOFS allocation under i_lock in xfs_attr_rmtval_set
xfs_attr_rmtval_set is always called with i_lock held, and 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_attr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index db15feb906f..bfb583791fe 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -2141,8 +2141,8 @@ xfs_attr_rmtval_set(xfs_da_args_t *args)
dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),
blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);
- bp = xfs_buf_get_flags(mp->m_ddev_targp, dblkno,
- blkcnt, XFS_BUF_LOCK);
+ bp = xfs_buf_get_flags(mp->m_ddev_targp, dblkno, blkcnt,
+ XFS_BUF_LOCK | XBF_DONT_BLOCK);
ASSERT(bp);
ASSERT(!XFS_BUF_GETERROR(bp));