summaryrefslogtreecommitdiffstats
path: root/fs/jbd2/journal.c
diff options
context:
space:
mode:
authorPatrick J. LoPresti <lopresti@gmail.com>2010-07-22 15:04:16 -0700
committerJoel Becker <joel.becker@oracle.com>2010-09-10 08:41:54 -0700
commit1113e1b504f6e8d4364c0b73c9097828067d4617 (patch)
tree15f606a79b486170992719e1d290d36f61ae409a /fs/jbd2/journal.c
parent30ca22c70e3ef0a96ff84de69cd7e8561b416cb2 (diff)
downloadop-kernel-dev-1113e1b504f6e8d4364c0b73c9097828067d4617.zip
op-kernel-dev-1113e1b504f6e8d4364c0b73c9097828067d4617.tar.gz
JBD2: Allow feature checks before journal recovery
Before we start accessing a huge (> 16 TiB) OCFS2 volume, we need to confirm that its journal supports 64-bit offsets. In particular, we need to check the journal's feature bits before recovering the journal. This is not possible with JBD2 at present, because the journal superblock (where the feature bits reside) is not loaded from disk until the journal is recovered. This patch loads the journal superblock in jbd2_journal_check_used_features() if it has not already been loaded, allowing us to check the feature bits before journal recovery. Signed-off-by: Patrick LoPresti <lopresti@gmail.com> Cc: linux-ext4@vger.kernel.org Acked-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/jbd2/journal.c')
-rw-r--r--fs/jbd2/journal.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 0e8014e..262419f 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1371,6 +1371,10 @@ int jbd2_journal_check_used_features (journal_t *journal, unsigned long compat,
if (!compat && !ro && !incompat)
return 1;
+ /* Load journal superblock if it is not loaded yet. */
+ if (journal->j_format_version == 0 &&
+ journal_get_superblock(journal) != 0)
+ return 0;
if (journal->j_format_version == 1)
return 0;
OpenPOWER on IntegriCloud