diff options
| author | Jan Kara <jack@suse.cz> | 2012-03-13 15:41:04 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:15 +0200 |
| commit | dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f (patch) | |
| tree | 4cd3d6aec851b5c88bf14f30e300c998ed6a7b66 /fs/jbd2/checkpoint.c | |
| parent | 1e287196507c4272f7096ad4b4f10b1cf4b9d280 (diff) | |
| download | kernel_samsung_smdk4412-dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f.zip kernel_samsung_smdk4412-dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f.tar.gz kernel_samsung_smdk4412-dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f.tar.bz2 | |
jbd2: split updating of journal superblock and marking journal empty
commit 24bcc89c7e7c64982e6192b4952a0a92379fc341 upstream.
There are three case of updating journal superblock. In the first case, we want
to mark journal as empty (setting s_sequence to 0), in the second case we want
to update log tail, in the third case we want to update s_errno. Split these
cases into separate functions. It makes the code slightly more straightforward
and later patches will make the distinction even more important.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
[bwh: Prerequisite for "jbd2: fix ocfs2 corrupt when updating journal
superblock fails".
Backported to 3.2: drop changes to trace events.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/jbd2/checkpoint.c')
| -rw-r--r-- | fs/jbd2/checkpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 16a698b..aa09868 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -550,7 +550,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal) (journal->j_flags & JBD2_BARRIER)) blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); if (!(journal->j_flags & JBD2_ABORT)) - jbd2_journal_update_superblock(journal, 1); + jbd2_journal_update_sb_log_tail(journal); return 0; } |