f2fs: clean up unnecessary indentation
[ Upstream commit 05d3273ad03fa5ea1177b4f3dfeeb6de4899b504 ] No functional change. Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0c57aa8ef9
commit
2fa8d128ec
@@ -431,7 +431,6 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
|
||||
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
||||
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
||||
unsigned int next;
|
||||
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
|
||||
|
||||
spin_lock(&free_i->segmap_lock);
|
||||
clear_bit(segno, free_i->free_segmap);
|
||||
@@ -439,7 +438,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
|
||||
|
||||
next = find_next_bit(free_i->free_segmap,
|
||||
start_segno + SEGS_PER_SEC(sbi), start_segno);
|
||||
if (next >= start_segno + usable_segs) {
|
||||
if (next >= start_segno + f2fs_usable_segs_in_sec(sbi)) {
|
||||
clear_bit(secno, free_i->free_secmap);
|
||||
free_i->free_sections++;
|
||||
}
|
||||
@@ -465,22 +464,31 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
|
||||
unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
|
||||
unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);
|
||||
unsigned int next;
|
||||
unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi);
|
||||
bool ret;
|
||||
|
||||
spin_lock(&free_i->segmap_lock);
|
||||
if (test_and_clear_bit(segno, free_i->free_segmap)) {
|
||||
free_i->free_segments++;
|
||||
ret = test_and_clear_bit(segno, free_i->free_segmap);
|
||||
if (!ret)
|
||||
goto unlock_out;
|
||||
|
||||
if (!inmem && IS_CURSEC(sbi, secno))
|
||||
goto skip_free;
|
||||
next = find_next_bit(free_i->free_segmap,
|
||||
start_segno + SEGS_PER_SEC(sbi), start_segno);
|
||||
if (next >= start_segno + usable_segs) {
|
||||
if (test_and_clear_bit(secno, free_i->free_secmap))
|
||||
free_i->free_sections++;
|
||||
}
|
||||
}
|
||||
skip_free:
|
||||
free_i->free_segments++;
|
||||
|
||||
if (!inmem && IS_CURSEC(sbi, secno))
|
||||
goto unlock_out;
|
||||
|
||||
/* check large section */
|
||||
next = find_next_bit(free_i->free_segmap,
|
||||
start_segno + SEGS_PER_SEC(sbi), start_segno);
|
||||
if (next < start_segno + f2fs_usable_segs_in_sec(sbi))
|
||||
goto unlock_out;
|
||||
|
||||
ret = test_and_clear_bit(secno, free_i->free_secmap);
|
||||
if (!ret)
|
||||
goto unlock_out;
|
||||
|
||||
free_i->free_sections++;
|
||||
|
||||
unlock_out:
|
||||
spin_unlock(&free_i->segmap_lock);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user