Skip to content

Commit bfd4766

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: clean up w/ sbi->log_sectors_per_block
Use sbi->log_sectors_per_block to clean up below calculated one: unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT; Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 90b7c4b commit bfd4766

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

fs/f2fs/segment.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4768,17 +4768,17 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
47684768
{
47694769
unsigned int wp_segno, wp_blkoff, zone_secno, zone_segno, segno;
47704770
block_t zone_block, wp_block, last_valid_block;
4771-
unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
47724771
int i, s, b, ret;
47734772
struct seg_entry *se;
47744773

47754774
if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
47764775
return 0;
47774776

4778-
wp_block = fdev->start_blk + (zone->wp >> log_sectors_per_block);
4777+
wp_block = fdev->start_blk + (zone->wp >> sbi->log_sectors_per_block);
47794778
wp_segno = GET_SEGNO(sbi, wp_block);
47804779
wp_blkoff = wp_block - START_BLOCK(sbi, wp_segno);
4781-
zone_block = fdev->start_blk + (zone->start >> log_sectors_per_block);
4780+
zone_block = fdev->start_blk + (zone->start >>
4781+
sbi->log_sectors_per_block);
47824782
zone_segno = GET_SEGNO(sbi, zone_block);
47834783
zone_secno = GET_SEC_FROM_SEG(sbi, zone_segno);
47844784

@@ -4824,7 +4824,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
48244824
"pointer. Reset the write pointer: wp[0x%x,0x%x]",
48254825
wp_segno, wp_blkoff);
48264826
ret = __f2fs_issue_discard_zone(sbi, fdev->bdev, zone_block,
4827-
zone->len >> log_sectors_per_block);
4827+
zone->len >> sbi->log_sectors_per_block);
48284828
if (ret)
48294829
f2fs_err(sbi, "Discard zone failed: %s (errno=%d)",
48304830
fdev->path, ret);
@@ -4885,7 +4885,6 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
48854885
struct blk_zone zone;
48864886
unsigned int cs_section, wp_segno, wp_blkoff, wp_sector_off;
48874887
block_t cs_zone_block, wp_block;
4888-
unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
48894888
sector_t zone_sector;
48904889
int err;
48914890

@@ -4897,8 +4896,8 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
48974896
return 0;
48984897

48994898
/* report zone for the sector the curseg points to */
4900-
zone_sector = (sector_t)(cs_zone_block - zbd->start_blk)
4901-
<< log_sectors_per_block;
4899+
zone_sector = (sector_t)(cs_zone_block - zbd->start_blk) <<
4900+
sbi->log_sectors_per_block;
49024901
err = blkdev_report_zones(zbd->bdev, zone_sector, 1,
49034902
report_one_zone_cb, &zone);
49044903
if (err != 1) {
@@ -4910,10 +4909,10 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
49104909
if (zone.type != BLK_ZONE_TYPE_SEQWRITE_REQ)
49114910
return 0;
49124911

4913-
wp_block = zbd->start_blk + (zone.wp >> log_sectors_per_block);
4912+
wp_block = zbd->start_blk + (zone.wp >> sbi->log_sectors_per_block);
49144913
wp_segno = GET_SEGNO(sbi, wp_block);
49154914
wp_blkoff = wp_block - START_BLOCK(sbi, wp_segno);
4916-
wp_sector_off = zone.wp & GENMASK(log_sectors_per_block - 1, 0);
4915+
wp_sector_off = zone.wp & GENMASK(sbi->log_sectors_per_block - 1, 0);
49174916

49184917
if (cs->segno == wp_segno && cs->next_blkoff == wp_blkoff &&
49194918
wp_sector_off == 0)
@@ -4940,8 +4939,8 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
49404939
if (!zbd)
49414940
return 0;
49424941

4943-
zone_sector = (sector_t)(cs_zone_block - zbd->start_blk)
4944-
<< log_sectors_per_block;
4942+
zone_sector = (sector_t)(cs_zone_block - zbd->start_blk) <<
4943+
sbi->log_sectors_per_block;
49454944
err = blkdev_report_zones(zbd->bdev, zone_sector, 1,
49464945
report_one_zone_cb, &zone);
49474946
if (err != 1) {
@@ -4959,7 +4958,7 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
49594958
"Reset the zone: curseg[0x%x,0x%x]",
49604959
type, cs->segno, cs->next_blkoff);
49614960
err = __f2fs_issue_discard_zone(sbi, zbd->bdev, cs_zone_block,
4962-
zone.len >> log_sectors_per_block);
4961+
zone.len >> sbi->log_sectors_per_block);
49634962
if (err) {
49644963
f2fs_err(sbi, "Discard zone failed: %s (errno=%d)",
49654964
zbd->path, err);

0 commit comments

Comments
 (0)