diff options
| author | Christoph Hellwig <hch@infradead.org> | 2009-07-18 18:14:56 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-08-12 01:07:14 -0500 |
| commit | 73195ed7864ae4a1fb0bea2ed9df59d19b4fde90 (patch) | |
| tree | fa82fba833a12dec9f6f8113852266e2861b276c | |
| parent | f41d7fb9da05b604f8a69fb6cac2a0563c8ede4e (diff) | |
| download | blackbird-op-linux-73195ed7864ae4a1fb0bea2ed9df59d19b4fde90.tar.gz blackbird-op-linux-73195ed7864ae4a1fb0bea2ed9df59d19b4fde90.zip | |
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: 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_da_btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index bd0bb6dfcdfa..2847bbc1c534 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c @@ -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; |
