Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760444Ab0HLRo0 (ORCPT ); Thu, 12 Aug 2010 13:44:26 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:22683 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758755Ab0HLRoV (ORCPT ); Thu, 12 Aug 2010 13:44:21 -0400 Date: Thu, 12 Aug 2010 10:43:19 -0700 From: Joel Becker To: Jan Kara , "Ted Ts'o" , "Patrick J. LoPresti" Cc: ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Ocfs2-devel] [PATCH 2/3] JBD2: Allow feature checks before journal recovery Message-ID: <20100812174318.GD6561@mail.oracle.com> Mail-Followup-To: Jan Kara , Ted Ts'o , "Patrick J. LoPresti" , ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org References: <874ofr2myq.fsf@patl.com> <8739vb2mxr.fsf@patl.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8739vb2mxr.fsf@patl.com> X-Burt-Line: Trees are cool. X-Red-Smith: Ninety feet between bases is perhaps as close as man has ever come to perfection. User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2148 Lines: 60 On Thu, Jul 22, 2010 at 03:04:16PM -0700, Patrick J. LoPresti wrote: > 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 Dear jbd2 developers, I've pushed this patch to the merge-window branch of ocfs2.git. I'm ready to send it to Linus, but I need your OK. Joel > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c > index bc2ff59..5cfd8d4 100644 > --- a/fs/jbd2/journal.c > +++ b/fs/jbd2/journal.c > @@ -1365,6 +1365,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; > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > http://oss.oracle.com/mailman/listinfo/ocfs2-devel -- Brain: I shall pollute the water supply with this DNAdefibuliser, turning everyone into mindless slaves. Pinky: What about the people who drink bottled water? Brain: Pinky, people who pay 5 dollars for a bottle of water are already mindless slaves. Joel Becker Consulting Software Developer Oracle E-mail: joel.becker@oracle.com Phone: (650) 506-8127 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/