Commit 9bcaaea7 authored by Chris Mason's avatar Chris Mason
Browse files

btrfs: fix the gfp_mask for the reada_zones radix tree 



Commits cc8385b5 and 7ef70b4d added preallocation for the
reada radix trees and also switched them over to GFP_KERNEL for the
default gfp mask.

Since we're doing radix tree insertions under spinlocks, we need
to make sure the mask doesn't allow sleeping.  This fix keeps
the radix preallocation but switches back to the original gfp_mask.

Reported-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent bce19f9d

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -2693,7 +2693,7 @@ int open_ctree(struct super_block *sb, 
	fs_info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;

	fs_info->avg_delayed_ref_runtime = NSEC_PER_SEC >> 6; /* div by 64 */

	/* readahead state */

	INIT_RADIX_TREE(&fs_info->reada_tree, GFP_KERNEL);

	INIT_RADIX_TREE(&fs_info->reada_tree, GFP_NOFS & ~__GFP_DIRECT_RECLAIM);

	spin_lock_init(&fs_info->reada_lock);



	fs_info->thread_pool_size = min_t(unsigned long,

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static struct btrfs_device *__alloc_device(void) 
	atomic_set(&dev->reada_in_flight, 0);

	atomic_set(&dev->dev_stats_ccnt, 0);

	btrfs_device_data_ordered_init(dev);

	INIT_RADIX_TREE(&dev->reada_zones, GFP_KERNEL);

	INIT_RADIX_TREE(&dev->reada_zones, GFP_NOFS & ~__GFP_DIRECT_RECLAIM);

	INIT_RADIX_TREE(&dev->reada_extents, GFP_NOFS & ~__GFP_DIRECT_RECLAIM);



	return dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE