Skip to content

Commit 1df2bc3

Browse files
LongPing WeiJaegeuk Kim
authored andcommitted
f2fs: clean up the unused variable additional_reserved_segments
additional_reserved_segments was introduced by commit 300a842 ("f2fs: fix to reserve space for IO align feature"), and its initialization was deleted by commit 87161a2 ("f2fs: deprecate io_bits"). Signed-off-by: LongPing Wei <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent cffaa09 commit 1df2bc3

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

fs/f2fs/f2fs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,6 @@ struct f2fs_sm_info {
10641064
unsigned int segment_count; /* total # of segments */
10651065
unsigned int main_segments; /* # of segments in main area */
10661066
unsigned int reserved_segments; /* # of reserved segments */
1067-
unsigned int additional_reserved_segments;/* reserved segs for IO align feature */
10681067
unsigned int ovp_segments; /* # of overprovision segments */
10691068

10701069
/* a threshold to reclaim prefree segments */

fs/f2fs/segment.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,7 @@ static inline unsigned int free_segments(struct f2fs_sb_info *sbi)
522522

523523
static inline unsigned int reserved_segments(struct f2fs_sb_info *sbi)
524524
{
525-
return SM_I(sbi)->reserved_segments +
526-
SM_I(sbi)->additional_reserved_segments;
525+
return SM_I(sbi)->reserved_segments;
527526
}
528527

529528
static inline unsigned int free_sections(struct f2fs_sb_info *sbi)

fs/f2fs/sysfs.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,7 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
501501
if (a->struct_type == RESERVED_BLOCKS) {
502502
spin_lock(&sbi->stat_lock);
503503
if (t > (unsigned long)(sbi->user_block_count -
504-
F2FS_OPTION(sbi).root_reserved_blocks -
505-
SEGS_TO_BLKS(sbi,
506-
SM_I(sbi)->additional_reserved_segments))) {
504+
F2FS_OPTION(sbi).root_reserved_blocks)) {
507505
spin_unlock(&sbi->stat_lock);
508506
return -EINVAL;
509507
}

0 commit comments

Comments
 (0)