jbd2: split updating of journal superblock and marking journal empty
authorJan Kara <jack@suse.cz>
Tue, 13 Mar 2012 19:41:04 +0000 (15:41 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 12 Aug 2015 14:33:15 +0000 (16:33 +0200)
commitdd8ff32c1e7ed10fb0e168b4431983e09acbeb2f
tree4cd3d6aec851b5c88bf14f30e300c998ed6a7b66
parent1e287196507c4272f7096ad4b4f10b1cf4b9d280
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>
fs/jbd2/checkpoint.c
fs/jbd2/commit.c
fs/jbd2/journal.c
include/linux/jbd2.h