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

Commit cc8385b5 authored by David Sterba's avatar David Sterba
Browse files

btrfs: preallocate radix tree node for readahead 



We can preallocate the node so insertion does not have to do that under
the lock. The GFP flags for the per-device radix tree are initialized to
 GFP_NOFS & ~__GFP_DIRECT_RECLAIM
but we can use GFP_KERNEL, same as an allocation above anyway, but also
because readahead is optional and not on any critical writeout path.

Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 261cc2cc

fs/btrfs/reada.c

+7 −0
Original line number Diff line number Diff line
@@ -270,6 +270,12 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info, 
	if (!zone)

		return NULL;



	ret = radix_tree_preload(GFP_KERNEL);

	if (ret) {

		kfree(zone);

		return NULL;

	}



	zone->start = start;

	zone->end = end;

	INIT_LIST_HEAD(&zone->list);
@@ -299,6 +305,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info, 
			zone = NULL;

	}

	spin_unlock(&fs_info->reada_lock);

	radix_tree_preload_end();



	return zone;

}

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_NOFS & ~__GFP_DIRECT_RECLAIM);

	INIT_RADIX_TREE(&dev->reada_zones, GFP_KERNEL);

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



	return dev;