]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
xfs: switch to NOFS allocation under i_lock in xfs_attr_rmtval_set
authorChristoph Hellwig <hch@infradead.org>
Sat, 18 Jul 2009 22:14:59 +0000 (18:14 -0400)
committerFelix Blyakher <felixb@sgi.com>
Wed, 12 Aug 2009 06:07:44 +0000 (01:07 -0500)
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>
fs/xfs/xfs_attr.c

index db15feb906fffa0e38b0e44f23ef3967faea33fd..bfb583791fe2585e92541f4c60e85245d59d9862 100644 (file)
@@ -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));