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 3DE2E1279BD; Mon, 18 Dec 2023 12:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B/azbmi5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D642CC433CB; Mon, 18 Dec 2023 12:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702903637; bh=k/GEFKTVR7h3frK8EcIPRpXjQT0XS1niBQpNi0uyN/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B/azbmi5ck9mSdsnFYXe6OVyZ6pddMiOI3B8A3PKDg1EYQVpdbSZexXqYuv+I1HEU 9xI6TAZE3YadIo6yV3umNeoixWLXoRaUvCnQCMrDyPgjv39TxBL3NmG+Dz3n5kCdHx TMaKj70X7YOhork/AR/q+dQ0zUrfMMdsmU8cDqSIODav8+u1SlcDqyrbSabeh7lFzW aHPN3T1Mw7wYMq7F/6p6MT/imPRRFOHUgxMZ3243qkGENFBD7Q/+wRqM7nP3xkKle9 oj8VaHqrtxZVuW/x1S3wkmqn8yZa3aX9Gd41G5tQ4f4HrVAHuymemKsQ0PEIDc9YfF 8nEB89w6N0wfA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Yi , Jan Kara , Theodore Ts'o , Sasha Levin , jack@suse.com, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 2/6] jbd2: correct the printing of write_flags in jbd2_write_superblock() Date: Mon, 18 Dec 2023 07:47:07 -0500 Message-ID: <20231218124713.1382373-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218124713.1382373-1-sashal@kernel.org> References: <20231218124713.1382373-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.302 Content-Transfer-Encoding: 8bit From: Zhang Yi [ Upstream commit 85559227211020b270728104c3b89918f7af27ac ] The write_flags print in the trace of jbd2_write_superblock() is not real, so move the modification before the trace. Signed-off-by: Zhang Yi Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20231129114740.2686201-1-yi.zhang@huaweicloud.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/jbd2/journal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 8a50722bca29e..629928b19e487 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1375,9 +1375,11 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags) return -EIO; } - trace_jbd2_write_superblock(journal, write_flags); if (!(journal->j_flags & JBD2_BARRIER)) write_flags &= ~(REQ_FUA | REQ_PREFLUSH); + + trace_jbd2_write_superblock(journal, write_flags); + if (buffer_write_io_error(bh)) { /* * Oh, dear. A previous attempt to write the journal -- 2.43.0