Commit 147ec1c6 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Jens Axboe
Browse files

f2fs: guard blkdev_zone_mgmt with nofs scope 



Guard the calls to blkdev_zone_mgmt() with a memalloc_nofs scope.
This helps us getting rid of the GFP_NOFS argument to blkdev_zone_mgmt();

Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20240128-zonefs_nofs-v3-4-ae3b7c8def61@wdc.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d9d55675

fs/f2fs/segment.c

+12 −3
Original line number Diff line number Diff line
@@ -1971,9 +1971,15 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, 
		}



		if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING))) {

			unsigned int nofs_flags;

			int ret;



			trace_f2fs_issue_reset_zone(bdev, blkstart);

			return blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,

						sector, nr_sects, GFP_NOFS);

			nofs_flags = memalloc_nofs_save();

			ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,

						sector, nr_sects, GFP_KERNEL);

			memalloc_nofs_restore(nofs_flags);

			return ret;

		}



		__queue_zone_reset_cmd(sbi, bdev, blkstart, lblkstart, blklen);
@@ -4865,6 +4871,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 
	block_t zone_block, valid_block_cnt;

	unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;

	int ret;

	unsigned int nofs_flags;



	if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)

		return 0;
@@ -4912,8 +4919,10 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 
		    "pointer: valid block[0x%x,0x%x] cond[0x%x]",

		    zone_segno, valid_block_cnt, zone->cond);



	nofs_flags = memalloc_nofs_save();

	ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,

				zone->start, zone->len, GFP_NOFS);

				zone->start, zone->len, GFP_KERNEL);

	memalloc_nofs_restore(nofs_flags);

	if (ret == -EOPNOTSUPP) {

		ret = blkdev_issue_zeroout(fdev->bdev, zone->wp,

					zone->len - (zone->wp - zone->start),