Skip to content

Commit 6576dd6

Browse files
konisakpm00
authored andcommitted
nilfs2: fix state management in error path of log writing function
After commit a694291 ("nilfs2: separate wait function from nilfs_segctor_write") was applied, the log writing function nilfs_segctor_do_construct() was able to issue I/O requests continuously even if user data blocks were split into multiple logs across segments, but two potential flaws were introduced in its error handling. First, if nilfs_segctor_begin_construction() fails while creating the second or subsequent logs, the log writing function returns without calling nilfs_segctor_abort_construction(), so the writeback flag set on pages/folios will remain uncleared. This causes page cache operations to hang waiting for the writeback flag. For example, truncate_inode_pages_final(), which is called via nilfs_evict_inode() when an inode is evicted from memory, will hang. Second, the NILFS_I_COLLECTED flag set on normal inodes remain uncleared. As a result, if the next log write involves checkpoint creation, that's fine, but if a partial log write is performed that does not, inodes with NILFS_I_COLLECTED set are erroneously removed from the "sc_dirty_files" list, and their data and b-tree blocks may not be written to the device, corrupting the block mapping. Fix these issues by uniformly calling nilfs_segctor_abort_construction() on failure of each step in the loop in nilfs_segctor_do_construct(), having it clean up logs and segment usages according to progress, and correcting the conditions for calling nilfs_redirty_inodes() to ensure that the NILFS_I_COLLECTED flag is cleared. Link: https://lkml.kernel.org/r/[email protected] Fixes: a694291 ("nilfs2: separate wait function from nilfs_segctor_write") Signed-off-by: Ryusuke Konishi <[email protected]> Tested-by: Ryusuke Konishi <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 5787fca commit 6576dd6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

fs/nilfs2/segment.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,6 +1812,9 @@ static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci,
18121812
nilfs_abort_logs(&logs, ret ? : err);
18131813

18141814
list_splice_tail_init(&sci->sc_segbufs, &logs);
1815+
if (list_empty(&logs))
1816+
return; /* if the first segment buffer preparation failed */
1817+
18151818
nilfs_cancel_segusage(&logs, nilfs->ns_sufile);
18161819
nilfs_free_incomplete_logs(&logs, nilfs);
18171820

@@ -2056,7 +2059,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
20562059

20572060
err = nilfs_segctor_begin_construction(sci, nilfs);
20582061
if (unlikely(err))
2059-
goto out;
2062+
goto failed;
20602063

20612064
/* Update time stamp */
20622065
sci->sc_seg_ctime = ktime_get_real_seconds();
@@ -2120,10 +2123,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
21202123
return err;
21212124

21222125
failed_to_write:
2123-
if (sci->sc_stage.flags & NILFS_CF_IFILE_STARTED)
2124-
nilfs_redirty_inodes(&sci->sc_dirty_files);
2125-
21262126
failed:
2127+
if (mode == SC_LSEG_SR && nilfs_sc_cstage_get(sci) >= NILFS_ST_IFILE)
2128+
nilfs_redirty_inodes(&sci->sc_dirty_files);
21272129
if (nilfs_doing_gc())
21282130
nilfs_redirty_inodes(&sci->sc_gc_inodes);
21292131
nilfs_segctor_abort_construction(sci, nilfs, err);

0 commit comments

Comments
 (0)