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

btrfs: switch GFP_NOFS to GFP_KERNEL in scrub_setup_recheck_block 



There's only one caller that calls scrub_setup_recheck_block in the
memalloc_nofs_save/_restore protection so it's effectively already
GFP_NOFS and it's safe to use GFP_KERNEL.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e2896e79

fs/btrfs/scrub.c

+2 −2
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock, 
			return -EIO;

		}



		recover = kzalloc(sizeof(struct scrub_recover), GFP_NOFS);

		recover = kzalloc(sizeof(struct scrub_recover), GFP_KERNEL);

		if (!recover) {

			btrfs_put_bioc(bioc);

			btrfs_bio_counter_dec(fs_info);
@@ -1516,7 +1516,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock, 
			sblock = sblocks_for_recheck[mirror_index];

			sblock->sctx = sctx;



			sector = alloc_scrub_sector(sblock, logical, GFP_NOFS);

			sector = alloc_scrub_sector(sblock, logical, GFP_KERNEL);

			if (!sector) {

				spin_lock(&sctx->stat_lock);

				sctx->stat.malloc_errors++;