f2fs: use helper to print zone condition
authorWu Bo <bo.wu@vivo.com>
Tue, 23 Apr 2024 11:27:59 +0000 (05:27 -0600)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 25 Apr 2024 15:33:44 +0000 (15:33 +0000)
To make code clean, use blk_zone_cond_str() to print debug information.

Signed-off-by: Wu Bo <bo.wu@vivo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/segment.c

index 2206199e809981ba1955aabc9b8d87bf6ae9a0ff..5d6dae4861f38de7e1f5b26060b2cb2019ded9f0 100644 (file)
@@ -5025,17 +5025,6 @@ out:
 }
 
 #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,