diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-12-09 16:56:26 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-09 16:56:26 +1100 |
| commit | 9807b773dad4555665931d57065d7f8adab58e0f (patch) | |
| tree | 1475442200af6def0e03a792311dff151ef9f331 /fs/xfs/libxfs/xfs_bmap_btree.c | |
| parent | a444d72e609062a040ed95a50e8fccfa1d58281b (diff) | |
| parent | 9875258ca7ab238a08bb9ad17e0c9b9984eac7df (diff) | |
| download | linux-9807b773dad4555665931d57065d7f8adab58e0f.tar.gz linux-9807b773dad4555665931d57065d7f8adab58e0f.tar.bz2 linux-9807b773dad4555665931d57065d7f8adab58e0f.zip | |
Merge branch 'xfs-4.10-misc-fixes-4' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap_btree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 94ad31d372ab..d6330c297ca0 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c @@ -796,7 +796,7 @@ xfs_bmbt_init_cursor( struct xfs_btree_cur *cur; ASSERT(whichfork != XFS_COW_FORK); - cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP); + cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS); cur->bc_tp = tp; cur->bc_mp = mp; |