mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-08 18:35:20 +02:00
UPSTREAM: f2fs: remove unused parameters
Remove unused parameter segno from f2fs_usable_segs_in_sec.
Change-Id: Ic17750f1ce12010b9f153a892eebc485edf00230
Signed-off-by: liuderong <liuderong@oppo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 2af583afcf
)
This commit is contained in:
parent
3e4be6b959
commit
1c5c2abbdb
|
@ -3774,8 +3774,7 @@ void f2fs_destroy_segment_manager_caches(void);
|
||||||
int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint);
|
int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint);
|
||||||
enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi,
|
enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi,
|
||||||
enum page_type type, enum temp_type temp);
|
enum page_type type, enum temp_type temp);
|
||||||
unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,
|
unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi);
|
||||||
unsigned int segno);
|
|
||||||
unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,
|
unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,
|
||||||
unsigned int segno);
|
unsigned int segno);
|
||||||
|
|
||||||
|
|
|
@ -368,7 +368,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
|
||||||
unsigned char age = 0;
|
unsigned char age = 0;
|
||||||
unsigned char u;
|
unsigned char u;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
unsigned int usable_segs_per_sec = f2fs_usable_segs_in_sec(sbi, segno);
|
unsigned int usable_segs_per_sec = f2fs_usable_segs_in_sec(sbi);
|
||||||
|
|
||||||
for (i = 0; i < usable_segs_per_sec; i++)
|
for (i = 0; i < usable_segs_per_sec; i++)
|
||||||
mtime += get_seg_entry(sbi, start + i)->mtime;
|
mtime += get_seg_entry(sbi, start + i)->mtime;
|
||||||
|
@ -1745,7 +1745,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
|
||||||
*/
|
*/
|
||||||
if (f2fs_sb_has_blkzoned(sbi))
|
if (f2fs_sb_has_blkzoned(sbi))
|
||||||
sec_end_segno -= SEGS_PER_SEC(sbi) -
|
sec_end_segno -= SEGS_PER_SEC(sbi) -
|
||||||
f2fs_usable_segs_in_sec(sbi, segno);
|
f2fs_usable_segs_in_sec(sbi);
|
||||||
|
|
||||||
if (gc_type == BG_GC || one_time) {
|
if (gc_type == BG_GC || one_time) {
|
||||||
unsigned int window_granularity =
|
unsigned int window_granularity =
|
||||||
|
@ -1938,7 +1938,7 @@ retry:
|
||||||
|
|
||||||
total_freed += seg_freed;
|
total_freed += seg_freed;
|
||||||
|
|
||||||
if (seg_freed == f2fs_usable_segs_in_sec(sbi, segno)) {
|
if (seg_freed == f2fs_usable_segs_in_sec(sbi)) {
|
||||||
sec_freed++;
|
sec_freed++;
|
||||||
total_sec_freed++;
|
total_sec_freed++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5413,8 +5413,7 @@ unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,
|
||||||
return BLKS_PER_SEG(sbi);
|
return BLKS_PER_SEG(sbi);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,
|
unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi)
|
||||||
unsigned int segno)
|
|
||||||
{
|
{
|
||||||
if (f2fs_sb_has_blkzoned(sbi))
|
if (f2fs_sb_has_blkzoned(sbi))
|
||||||
return CAP_SEGS_PER_SEC(sbi);
|
return CAP_SEGS_PER_SEC(sbi);
|
||||||
|
|
|
@ -431,7 +431,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
|
||||||
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
||||||
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
||||||
unsigned int next;
|
unsigned int next;
|
||||||
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi, segno);
|
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
|
||||||
|
|
||||||
spin_lock(&free_i->segmap_lock);
|
spin_lock(&free_i->segmap_lock);
|
||||||
clear_bit(segno, free_i->free_segmap);
|
clear_bit(segno, free_i->free_segmap);
|
||||||
|
@ -465,7 +465,7 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
|
||||||
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
||||||
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
||||||
unsigned int next;
|
unsigned int next;
|
||||||
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi, segno);
|
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
|
||||||
|
|
||||||
spin_lock(&free_i->segmap_lock);
|
spin_lock(&free_i->segmap_lock);
|
||||||
if (test_and_clear_bit(segno, free_i->free_segmap)) {
|
if (test_and_clear_bit(segno, free_i->free_segmap)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user