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 /include/linux | |
| parent | 1e287196507c4272f7096ad4b4f10b1cf4b9d280 (diff) | |
| download | lwn-dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f.tar.gz lwn-dd8ff32c1e7ed10fb0e168b4431983e09acbeb2f.zip | |
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 'include/linux')
| -rw-r--r-- | include/linux/jbd2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index a153ed52e64f..9d75499f92bd 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1083,7 +1083,7 @@ extern int jbd2_journal_destroy (journal_t *); extern int jbd2_journal_recover (journal_t *journal); extern int jbd2_journal_wipe (journal_t *, int); extern int jbd2_journal_skip_recovery (journal_t *); -extern void jbd2_journal_update_superblock (journal_t *, int); +extern void jbd2_journal_update_sb_log_tail (journal_t *); extern void __jbd2_journal_abort_hard (journal_t *); extern void jbd2_journal_abort (journal_t *, int); extern int jbd2_journal_errno (journal_t *); |