public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

f2fs: remove unecessary variable and code

Browse source 
Code cleanup without behavior changed.

Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Haicheng Li 2013-05-14 18:20:28 +08:00 • committed by Jaegeuk Kim
parent bfe35965ec
commit 81fb5e8746
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/f2fs/segment.c
View file

@ -126,17 +126,16 @@ void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)
static void set_prefree_as_free_segments(struct f2fs_sb_info *sbi) static void set_prefree_as_free_segments(struct f2fs_sb_info *sbi)
{ {
struct dirty_seglist_info *dirty_i = DIRTY_I(sbi); struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
unsigned int segno, offset = 0; unsigned int segno = -1;
unsigned int total_segs = TOTAL_SEGS(sbi); unsigned int total_segs = TOTAL_SEGS(sbi);
mutex_lock(&dirty_i->seglist_lock); mutex_lock(&dirty_i->seglist_lock);
while (1) { while (1) {
segno = find_next_bit(dirty_i->dirty_segmap[PRE], total_segs, segno = find_next_bit(dirty_i->dirty_segmap[PRE], total_segs,
offset); segno + 1);
if (segno >= total_segs) if (segno >= total_segs)
break; break;
__set_test_and_free(sbi, segno); __set_test_and_free(sbi, segno);
offset = segno + 1;
} }
mutex_unlock(&dirty_i->seglist_lock); mutex_unlock(&dirty_i->seglist_lock);
} }
@ -144,17 +143,16 @@ static void set_prefree_as_free_segments(struct f2fs_sb_info *sbi)
void clear_prefree_segments(struct f2fs_sb_info *sbi) void clear_prefree_segments(struct f2fs_sb_info *sbi)
{ {
struct dirty_seglist_info *dirty_i = DIRTY_I(sbi); struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
unsigned int segno, offset = 0; unsigned int segno = -1;
unsigned int total_segs = TOTAL_SEGS(sbi); unsigned int total_segs = TOTAL_SEGS(sbi);
mutex_lock(&dirty_i->seglist_lock); mutex_lock(&dirty_i->seglist_lock);
while (1) { while (1) {
segno = find_next_bit(dirty_i->dirty_segmap[PRE], total_segs, segno = find_next_bit(dirty_i->dirty_segmap[PRE], total_segs,
offset); segno + 1);
if (segno >= total_segs) if (segno >= total_segs)
break; break;
offset = segno + 1;
if (test_and_clear_bit(segno, dirty_i->dirty_segmap[PRE])) if (test_and_clear_bit(segno, dirty_i->dirty_segmap[PRE]))
dirty_i->nr_dirty[PRE]--; dirty_i->nr_dirty[PRE]--;
@ -364,11 +362,11 @@ next:
static int is_next_segment_free(struct f2fs_sb_info *sbi, int type) static int is_next_segment_free(struct f2fs_sb_info *sbi, int type)
{ {
struct curseg_info *curseg = CURSEG_I(sbi, type); struct curseg_info *curseg = CURSEG_I(sbi, type);
unsigned int segno = curseg->segno; unsigned int segno = curseg->segno + 1;
struct free_segmap_info *free_i = FREE_I(sbi); struct free_segmap_info *free_i = FREE_I(sbi);
if (segno + 1 < TOTAL_SEGS(sbi) && (segno + 1) % sbi->segs_per_sec) if (segno < TOTAL_SEGS(sbi) && segno % sbi->segs_per_sec)
return !test_bit(segno + 1, free_i->free_segmap); return !test_bit(segno, free_i->free_segmap);
return 0; return 0;
} }
@ -495,7 +493,7 @@ static void new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec)
int dir = ALLOC_LEFT; int dir = ALLOC_LEFT;
write_sum_page(sbi, curseg->sum_blk, write_sum_page(sbi, curseg->sum_blk,
GET_SUM_BLOCK(sbi, curseg->segno)); GET_SUM_BLOCK(sbi, segno));
if (type == CURSEG_WARM_DATA || type == CURSEG_COLD_DATA) if (type == CURSEG_WARM_DATA || type == CURSEG_COLD_DATA)
dir = ALLOC_RIGHT; dir = ALLOC_RIGHT;