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

Commit 73195ed7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Felix Blyakher
Browse files

xfs: switch to NOFS allocation under i_lock in xfs_da_buf_make 



i_lock is taken in the 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 f41d7fb9

fs/xfs/xfs_da_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -2261,9 +2261,9 @@ xfs_da_buf_make(int nbuf, xfs_buf_t **bps, inst_t *ra) 
	int		off;



	if (nbuf == 1)

		dabuf = kmem_zone_alloc(xfs_dabuf_zone, KM_SLEEP);

		dabuf = kmem_zone_alloc(xfs_dabuf_zone, KM_NOFS);

	else

		dabuf = kmem_alloc(XFS_DA_BUF_SIZE(nbuf), KM_SLEEP);

		dabuf = kmem_alloc(XFS_DA_BUF_SIZE(nbuf), KM_NOFS);

	dabuf->dirty = 0;

#ifdef XFS_DABUF_DEBUG

	dabuf->ra = ra;