From patchwork Mon May 17 14:03:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 440139 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1210220jac; Mon, 17 May 2021 08:51:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIHYoJYGRn7MSVGVmcQsGdCa93yUfdpNrSxR7Ads4vCIcZqTvhnz+t/FVyHo5L5Wx4cq3v X-Received: by 2002:a05:6e02:1cac:: with SMTP id x12mr276163ill.43.1621266668966; Mon, 17 May 2021 08:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621266668; cv=none; d=google.com; s=arc-20160816; b=htmF0pcf9QtobJ5utj/PwCf4+E0k86k1GZBhvv9f8fR1WdbK0kUp8CKKfyOXHP40Dx z+TpD2aVGIZ7yf8Vi9qefo0XggeI4/INWDWXKu/HlFOX2cmlLyxEUrzLad3JcUnXBfmD Eu5DYnGAah//NPNsZU9jxdzVlU9CqxF4U0UNAWnQehhNhwYA2GwFhgtqFEm0z30jzWij xG1v1cvdHvFlGSmvPkYnKQy6tVCaBqtLnKw9SQXX8IPn4j6CRFX2U08TdN68+Wj6qlOO dYYDSAaG1uhTKoZhTfwvnhl3Qpzxn3NJarSc0RPMmJpOhdKYN/zyG1CGWR5yTdVmG15X cDvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BfJ27W+DO3SLd6cjNsmhFSvMOqK7oBFgCyQaWRNwI24=; b=lL2tKWONG/dF9ismEzp+4CCc/iktKg2a9fPprsaLNQ8Yui+WgoGl16aDmTeqdNZuGZ phOUU5bJB80UW42jOHw0Ounh/spKTuJYgb4vBqTAJGcRrWbzwpxsioGwX0wLn8/ewZ55 G92ZiwtUqraitTpMw+Rr5gdaaDm3pSC7waikgE23NFriqr36CJKcdaY9Q+RIEiD7wGh/ s2NgPxCt81uDlknkv6YjomjMGTsncDpM35hwb1foHd1IfW153YtL1fXsuzZNYMT4fQS/ OjniflIqFOQndcR0hjjZREUcQ2/ekiFU3U5O+TNK181EEF7SGhDT8VV/hJBnFalGDRRi KWnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="O07/U1yN"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n6si19978668jal.41.2021.05.17.08.51.08; Mon, 17 May 2021 08:51:08 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="O07/U1yN"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343753AbhEQPwW (ORCPT + 12 others); Mon, 17 May 2021 11:52:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:42556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345104AbhEQPuN (ORCPT ); Mon, 17 May 2021 11:50:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E2B3C61D4A; Mon, 17 May 2021 14:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621262741; bh=kx7QYXjjS4CpwlcVb7ZZe38xdibpiJrpUzhTuRACDQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O07/U1yN2NCNy6VpG8ipxbd1vQIIZ34jRSiOWaSwKZKShE6bOQKDr8LAwDnkE90SQ r6g3eWMj5hzd+md77OIWGpDwj166qWTClaBdA676Furm0K+/EzXNxdvFXrN9dQogSu We8ok8D/jmd+ol/uq5UEGqYORCqlEkKgKL6bHhy0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Arnd Bergmann , Theodore Tso Subject: [PATCH 5.10 287/289] ext4: fix debug format string warning Date: Mon, 17 May 2021 16:03:32 +0200 Message-Id: <20210517140314.805701058@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140305.140529752@linuxfoundation.org> References: <20210517140305.140529752@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit fcdf3c34b7abdcbb49690c94c7fa6ce224dc9749 upstream. Using no_printk() for jbd_debug() revealed two warnings: fs/jbd2/recovery.c: In function 'fc_do_one_pass': fs/jbd2/recovery.c:256:30: error: format '%d' expects a matching 'int' argument [-Werror=format=] 256 | jbd_debug(3, "Processing fast commit blk with seq %d"); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/ext4/fast_commit.c: In function 'ext4_fc_replay_add_range': fs/ext4/fast_commit.c:1732:30: error: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Werror=format=] 1732 | jbd_debug(1, "Converting from %d to %d %lld", The first one was added incorrectly, and was also missing a few newlines in debug output, and the second one happened when the type of an argument changed. Reported-by: kernel test robot Fixes: d556435156b7 ("jbd2: avoid -Wempty-body warnings") Fixes: 6db074618969 ("ext4: use BIT() macro for BH_** state bits") Fixes: 5b849b5f96b4 ("jbd2: fast commit recovery path") Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210409201211.1866633-1-arnd@kernel.org Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/fast_commit.c | 2 +- fs/jbd2/recovery.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1694,7 +1694,7 @@ static int ext4_fc_replay_add_range(stru } /* Range is mapped and needs a state change */ - jbd_debug(1, "Converting from %d to %d %lld", + jbd_debug(1, "Converting from %ld to %d %lld", map.m_flags & EXT4_MAP_UNWRITTEN, ext4_ext_is_unwritten(ex), map.m_pblk); ret = ext4_ext_replay_update_ex(inode, cur, map.m_len, --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -245,15 +245,14 @@ static int fc_do_one_pass(journal_t *jou return 0; while (next_fc_block <= journal->j_fc_last) { - jbd_debug(3, "Fast commit replay: next block %ld", + jbd_debug(3, "Fast commit replay: next block %ld\n", next_fc_block); err = jread(&bh, journal, next_fc_block); if (err) { - jbd_debug(3, "Fast commit replay: read error"); + jbd_debug(3, "Fast commit replay: read error\n"); break; } - jbd_debug(3, "Processing fast commit blk with seq %d"); err = journal->j_fc_replay_callback(journal, bh, pass, next_fc_block - journal->j_fc_first, expected_commit_id);