Revert "f2fs: put allocate_segment after refresh_sit_entry"

commit c6f82fe90d7458e5fa190a6820bfc24f96b0de4e upstream.

This reverts commit 3436c4bdb30de421d46f58c9174669fbcfd40ce0.

This makes a leak to register dirty segments. I reproduced the issue by
modified postmark which injects a lot of file create/delete/update and
finally triggers huge number of SSR allocations.

[Jaegeuk Kim: Change missing incorrect comment]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 29ef7088c5582a480b6a1f7965fbbcca4f07e24e..0f051e3ef535d4f363f6951f12aca5103c8f877d 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1788,15 +1788,14 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
 
        stat_inc_block_count(sbi, curseg);
 
+       if (!__has_curseg_space(sbi, type))
+               sit_i->s_ops->allocate_segment(sbi, type, false);
        /*
-        * SIT information should be updated before segment allocation,
-        * since SSR needs latest valid block information.
+        * SIT information should be updated after segment allocation,
+        * since we need to keep dirty segments precisely under SSR.
         */
        refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr);
 
-       if (!__has_curseg_space(sbi, type))
-               sit_i->s_ops->allocate_segment(sbi, type, false);
-
        mutex_unlock(&sit_i->sentry_lock);
 
        if (page && IS_NODESEG(type))