From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFA6A263F5E; Tue, 27 May 2025 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364709; cv=none; b=Cww/s4T3knydnB9AHNt6tnoAL44SVRZnu0+lKYmyjsEp0Tec2mO/CNC49aUys9NEnyqprfEJHNCtLP18JM3Y9HMFauxv4d9Zd64HoI6go/jY+aymiVFghUBF6LqPowWARivc5Y/qZHj70kPYS8jfG4OVKqia25hebUyCerJBBXk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364709; c=relaxed/simple; bh=AkgBZia+Utw+lBUvsZSCVAL0M6wHvLnZKT/JvcqFwSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cxlQhYpycEkQMm6TRqCxgtyOKctFEtUowHhmcUhicrpYNF0L8H9LQchvpq9t3UQ4IMDP+TAW6Abfp3lPbbdvd5h4jZFHJfEUQM/NLKnjH5ZqoFoHsWjTHE/H8RAH63cIG/LEBynBWmyqcGCciMInDTB4CFUdkQVPSIIXTz/FB0E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nce9e15M; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nce9e15M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B42CC4CEE9; Tue, 27 May 2025 16:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748364708; bh=AkgBZia+Utw+lBUvsZSCVAL0M6wHvLnZKT/JvcqFwSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nce9e15M0S1U0HtA1g1ei6CZiJpzKHUIc9lXSQFrgLnNcTVh7ZSVY4Ljw/WSXuKYu E6VyrbYnjdlDwxG+yZGj3MScwKWdsy1fAq6pZBvlnUqOu56rMUpQj5RE/lanT9z2H8 XQj1LWHa7DMmbD7ZcsPENxigQV5Vv6WFVdRy2osE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jan Kara , Zhang Yi , Theodore Tso , Sasha Levin Subject: [PATCH 6.12 140/626] jbd2: do not try to recover wiped journal Date: Tue, 27 May 2025 18:20:33 +0200 Message-ID: <20250527162450.718613168@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara [ Upstream commit a662f3c03b754e1f97a2781fa242e95bdb139798 ] If a journal is wiped, we will set journal->j_tail to 0. However if 'write' argument is not set (as it happens for read-only device or for ocfs2), the on-disk superblock is not updated accordingly and thus jbd2_journal_recover() cat try to recover the wiped journal. Fix the check in jbd2_journal_recover() to use journal->j_tail for checking empty journal instead. Signed-off-by: Jan Kara Reviewed-by: Zhang Yi Link: https://patch.msgid.link/20250206094657.20865-4-jack@suse.cz Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/jbd2/recovery.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 667f67342c522..f85f401526c54 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -287,19 +287,20 @@ static int fc_do_one_pass(journal_t *journal, int jbd2_journal_recover(journal_t *journal) { int err, err2; - journal_superblock_t * sb; - struct recovery_info info; memset(&info, 0, sizeof(info)); - sb = journal->j_superblock; /* * The journal superblock's s_start field (the current log head) * is always zero if, and only if, the journal was cleanly - * unmounted. + * unmounted. We use its in-memory version j_tail here because + * jbd2_journal_wipe() could have updated it without updating journal + * superblock. */ - if (!sb->s_start) { + if (!journal->j_tail) { + journal_superblock_t *sb = journal->j_superblock; + jbd2_debug(1, "No recovery required, last transaction %d, head block %u\n", be32_to_cpu(sb->s_sequence), be32_to_cpu(sb->s_head)); journal->j_transaction_sequence = be32_to_cpu(sb->s_sequence) + 1; -- 2.39.5