From patchwork Mon May 17 14:03:58 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: 440136 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1205670jac; Mon, 17 May 2021 08:45:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweSAjbF+yLN1zsgm6AJfeuolLNe7yETreYSTuxsaXLznUs2RIO02RxVKlfIZbzEfsch/nw X-Received: by 2002:a4a:8e04:: with SMTP id q4mr449411ook.28.1621266335626; Mon, 17 May 2021 08:45:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621266335; cv=none; d=google.com; s=arc-20160816; b=MA+1NLT0A+FVRK21XgGdh6+3LzJ5MB//DwlTeEv+Sa0+MRZO0sxaxO58k8nE+T12UP rR5JSFrgFPeEpjUF/uArN7pmHatchpVuZiB6jC/8ZuVW0uiV2sbtl2e+MJf2RIBoTDpo aZCbBpGffeI9i+Br5MP/CF7bnr7PrRAOBi/zWEx+Hf42/ibQfd8pURFiuv8jU3fwfwTD 22YfYJIQBtoTYLytScYKAPV0RPoCd4RerKJCy+QE7f5biuwZLCjneVuV1CVr+X1M0F6h fuE9wSibocg8dviARE20ik9jIjIS31uaB/ueW8p5fijHcB4oaGC4CIB1WUg8NbQ7uCYP qRXg== 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=wy+26pvFDiA1GW01w2Ts2i0w+uYcjEJjduWUzSTtcno=; b=Z43V4vV+q2D1GCwrmbnZzCrM5Ih7CkGxgfAjOy1T51xcyLZK3e+JaiOrP+hd6n5f3k I9kQvhhGSHYadJIfDHZDsVRgZ46JvPrW1/+CJYZrAkcJWc0tgYEMARiPo4Gp/s4RoyUK vu1MYozZIBu1P/JhBoPMEnS6/9CkcO8WEjQe4WtfhSZCchnYnBtFN6oqXgOmuZqsQRXK njID98fQ3QKcXlGoKzzKn/8TW3BTB2F2SKq+weDlID+fAzn9e77kKyiX1NP/wMpDvnSB MgjjE+E+sEVA7iqOi8/Gh6EV2TLEt3hEJcB3i8cDa0RY/zeVjvoWotjvWfwSz6R6Pvfh 4QFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1Mu5rlKS; 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 s3si13712389oot.60.2021.05.17.08.45.34; Mon, 17 May 2021 08:45:35 -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=1Mu5rlKS; 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 S244245AbhEQPqn (ORCPT + 12 others); Mon, 17 May 2021 11:46:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:52294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344302AbhEQPoP (ORCPT ); Mon, 17 May 2021 11:44:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BA1C961953; Mon, 17 May 2021 14:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621262593; bh=lIpkaJ7PLQAmAmllMdwCWzsL+Sc3Acu2iaBpRc+uVUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Mu5rlKSWrfQ20+o4iDyTVW3uOObX17ou/+BTLAgX5WG1q/iUhe8R3gNt0HGpuymb yymfpjzUo5WaAiyKSUihF3+W6vPd6Q3hUcN7arL3GZ8RZIPGmhzFq/gBqQGUuVUtAx U/0jKbJMtC51iW9exXOpdZ5Kx3F5TKHhGLL7LDuA= 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.11 327/329] ext4: fix debug format string warning Date: Mon, 17 May 2021 16:03:58 +0200 Message-Id: <20210517140313.149443098@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.043055203@linuxfoundation.org> References: <20210517140302.043055203@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 @@ -1743,7 +1743,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);