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 376C221882B; Mon, 2 Jun 2025 14:07:57 +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=1748873279; cv=none; b=Fw7HRFoljvmON1KcyS+h49rQ9wJ/F/jtttOZt7HB32ufFYCbpcf277oG54hBnbvrFCo7WdyEZYw9m3hIevgMLW4bQjZTlupMlFvfRp+7ue3C/5Sci2auNXaMwN99lJZLXIZugKGrKZfnMYbDVef3ZY8o7RNWnoN8QvxNp1i/Ij0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748873279; c=relaxed/simple; bh=FhoLs1Mjm8Susk7TrSrpYDyhdOBGacTo6S3X0mtAj58=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uw0/h3Of3PoVrWxgTpyPd8aFGuDeERQNuoNAHDM1w0/zIrb1tZVw/bwJ5FZVu8PSX1dQ69kp6N9A/Lv+OCCWzWhd5RCVCj6HRUA2iVNm7qmFDqanGWwCX8s2rgnH/R2z5P+OYlXNqIJlDUXOsfLmUHrV7hS0A6h0HOP4ztA79RA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g1mKHUIE; 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="g1mKHUIE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36380C4CEEB; Mon, 2 Jun 2025 14:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748873277; bh=FhoLs1Mjm8Susk7TrSrpYDyhdOBGacTo6S3X0mtAj58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g1mKHUIEe//jwEkL94afqz5fM/1YBb2jSGm3ncdS0irB6t9EkefM0jviP1n9zDTdE Sdy7RWRo6+4yn7zICf20wPGM9APdGmb+nv+8ATsWSqD1omJcFkp80/HWm8BAB/y1FT zl5ijqxLa0ahF5GG6Z1o/CVlVR5vXv8U5NG72oH8= 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.6 092/444] jbd2: do not try to recover wiped journal Date: Mon, 2 Jun 2025 15:42:36 +0200 Message-ID: <20250602134344.624518836@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134340.906731340@linuxfoundation.org> References: <20250602134340.906731340@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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 421c0d360836e..19ec325374833 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -286,21 +286,22 @@ 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; errseq_t wb_err; struct address_space *mapping; 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