Commit 3763f9ef authored by Wu Bo's avatar Wu Bo Committed by Jaegeuk Kim
Browse files

f2fs: use helper to print zone condition 



To make code clean, use blk_zone_cond_str() to print debug information.

Signed-off-by: default avatarWu Bo <bo.wu@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b864ddb5

fs/f2fs/segment.c

+3 −14
Original line number Diff line number Diff line
@@ -5025,17 +5025,6 @@ static int sanity_check_curseg(struct f2fs_sb_info *sbi) 
}



#ifdef CONFIG_BLK_DEV_ZONED

static const char *f2fs_zone_status[BLK_ZONE_COND_OFFLINE + 1] = {

	[BLK_ZONE_COND_NOT_WP]		= "NOT_WP",

	[BLK_ZONE_COND_EMPTY]		= "EMPTY",

	[BLK_ZONE_COND_IMP_OPEN]	= "IMPLICIT_OPEN",

	[BLK_ZONE_COND_EXP_OPEN]	= "EXPLICIT_OPEN",

	[BLK_ZONE_COND_CLOSED]		= "CLOSED",

	[BLK_ZONE_COND_READONLY]	= "READONLY",

	[BLK_ZONE_COND_FULL]		= "FULL",

	[BLK_ZONE_COND_OFFLINE]		= "OFFLINE",

};



static int check_zone_write_pointer(struct f2fs_sb_info *sbi,

				    struct f2fs_dev_info *fdev,

				    struct blk_zone *zone)
@@ -5066,7 +5055,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 
	if (IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, zone_segno))) {

		f2fs_notice(sbi, "Open zones: valid block[0x%x,0x%x] cond[%s]",

				zone_segno, valid_block_cnt,

				f2fs_zone_status[zone->cond]);

				blk_zone_cond_str(zone->cond));

		return 0;

	}
@@ -5077,7 +5066,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 
	if (!valid_block_cnt) {

		f2fs_notice(sbi, "Zone without valid block has non-zero write "

			    "pointer. Reset the write pointer: cond[%s]",

			    f2fs_zone_status[zone->cond]);

			    blk_zone_cond_str(zone->cond));

		ret = __f2fs_issue_discard_zone(sbi, fdev->bdev, zone_block,

					zone->len >> log_sectors_per_block);

		if (ret)
@@ -5095,7 +5084,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 
	 */

	f2fs_notice(sbi, "Valid blocks are not aligned with write "

		    "pointer: valid block[0x%x,0x%x] cond[%s]",

		    zone_segno, valid_block_cnt, f2fs_zone_status[zone->cond]);

		    zone_segno, valid_block_cnt, blk_zone_cond_str(zone->cond));



	nofs_flags = memalloc_nofs_save();

	ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,