f2fs: clean up unnecessary indentation
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: clean up unnecessary indentation
No functional change.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/segment.h | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-)
fs/f2fs/segment.h +24 -16
@@ -429,7 +429,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);
@@ -437,7 +436,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++; }
@@ -463,22 +462,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++; - -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: + ret =test_and_clear_bit (segno, free_i->free_segmap); +if (!ret) + goto unlock_out; + + 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); }
Signature · 1 line
2.49.0.504.g3bcea36a83-goog
Quoted 3 lines · On 4/5/25 03:54, Jaegeuk Kim via Linux-f2fs-devel wrote:
No functional change.
Signed-off-by Jaegeuk Kim <[email protected]>
Reviewed-by Chao Yu <[email protected]>
Thanks,
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 6 lines · On Fri, 4 Apr 2025 19:54:42 +0000 you wrote:
No functional change.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/segment.h | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: clean up unnecessary indentation
https://git.kernel.org/jaegeuk/f2fs/c/05d3273ad03f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html