From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A055F3E5EF6 for ; Fri, 20 Mar 2026 18:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774030256; cv=none; b=MQq1Beu8cQGkY0CdU/0zLMnmEyDaV4AbIjJtKuhxqjbI7sXMFdnPzhGCYmsEN9jTt/l6mZrwynrt76Y2RKv7+C8Nl/OL0xfAOPCQ7ObtE91EAyu22BqQMvzN/5Nvr9Q8wLXzWA7PCirk4Wh0t7KgqT+UcVXclFyS8HAgveLw1jc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774030256; c=relaxed/simple; bh=sZ044YpPu4R5dXrNGbenZJqvSeauBzwp0RnljpfXqow=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fQHQe4+CLuNp/uZZXgPwlYaqxQN4e+SvwUx8Nzrf+R8iVWufWVmdal60YxeHnKev4waBXFO5sqfSQ4hpcCVeRpeNwzF1TYJx/pK6MjUXVOuNlq9ljzF7Mf/3LXugyRfky2XDhawLwoN/h75GuRv3aLSC/1LKW2BdNGi48IHhuoQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FclW1RY1; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FclW1RY1" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-359fea895b5so1551239a91.0 for ; Fri, 20 Mar 2026 11:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774030253; x=1774635053; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ISn/U3wnVX56vQY00IkkHQXLUWsuK0LhCSEUHY06MyE=; b=FclW1RY1IzKS2ohmjktg7a8TUhDqAQ3MwXtYQEzHo+PRzCm2NMXAI7Y93jT/IefNNp xXyRhb4+H0nW5fLbpxzM7YJ5W/7sCRaE7cZT/lvII+tdAvgAA9OauYGWUfFK7lWKvhd7 L0qCNnLPk7co8nyMS7pyRAiu7F2pC4RsUflsAF+L1DrFSMu3HcCbODwlnB06R+McNjM1 G4B//ZUPZKSrIvHIjj3PgyHaMSZ5UfaTDkR2hjdhWHtVHDjDunZ126urTbJKD6CJkKI9 YqbhOrr43jpRlbx0ici5iu+kVyDkA+sKXqV4LPYP+f50Sb8qN+Su5qIhn7vef41UETvc n9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774030253; x=1774635053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ISn/U3wnVX56vQY00IkkHQXLUWsuK0LhCSEUHY06MyE=; b=A1IKFTNKgS0y3xzbC6zJvBtb8UKGvruoy5obObhqUy/inMTJO2OUm+jC2ITkN8z2uV YhOPn9yuOHjWpIMKqGhWOneRH3oCn22vnEJwMcA2clu6EnSfvU/x/2e+rK84OztAkOMo xj1qRft5T5tCghj6X9L7CcliANyAzQYTwdb18ZkhBtJjm+TzIwzoqVJjJDVM8U3ldT++ StPvIaeH0oo4dvLykn3ih0GT5jxQAkoiCIbIMNOCtkaQUPEl51/sC/Iu4c2sNBdk6GhQ Fe+1JZKp+aJl8Ea9VNguypf84TlK11Z7ULa0edDaoM1Ai82CZBspeH33k2O4FsRxb6tc JDPQ== X-Forwarded-Encrypted: i=1; AJvYcCUowL+PAiS8SoNnJi39NzDYTISGukrgC55nB1ro4kUVOtqgYstsZf5O3GrCddvcUuUCXoc+kgg2Wyto+JI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq0FIqURtP/Oh+88Ancu/Wy+HwBuktd1otjX8OhdLn0UHS0iAR MDRDvURH0WTlVCHSZjM6GaUMEQhkLi4R8djFPeNb0ykaEumIkdgXmtpW X-Gm-Gg: ATEYQzxdTvjWkwKA13C3o2ZI8aQn9q1BPUZ3eRvH9HQ7z5osD4pZluPO15qXLxv0k2z O2mAAgms0hoN308FsQI6YmOoSLS7LbcjWyvcNoKVtTKxvNTlGZzwfd+ZNEZHli0FVO7546RbftL ZNoPG+uwRrjTVdtqBhQVk0w14vGyj4RPkJ3JvADdT1OI4LAq9OrZFZ9QY3n3ypC1shfx9CHv6l5 +cD/k1VswbUfbuaYJhPk+qAsGS77jzcHTHl17W4m3jWIWopXE8sAKpG+kHrXuFBJEhT49PIpWMP xclyzNNNFcdRfNYpidBTOw4TOoj/L0yvKkjQ4tX+vBPPkGSuQHlhvj1GM2TaM1sO879rB3vmSRh S6Sp6Zfsj3At8iVffx0UTA/MRiYepD4nkj9hpjr6Es9QDdjNjeOTkBhPZPRCT0MILbSRtgtCzU2 yceAa9UYJcvVBOh+EZDgx9EmQyIMvyvtaxOXIkkLdbqUsa7dPW2qDCx6oQ13QRm+Hqz45fH6I= X-Received: by 2002:a17:90b:2d8d:b0:359:fd9a:c506 with SMTP id 98e67ed59e1d1-35bd2d31502mr3244103a91.29.1774030252740; Fri, 20 Mar 2026 11:10:52 -0700 (PDT) Received: from sean-All-Series.. (1-160-226-215.dynamic-ip.hinet.net. [1.160.226.215]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bd368837bsm959352a91.11.2026.03.20.11.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 11:10:51 -0700 (PDT) From: Sean Chang To: Andrew Lunn , Chuck Lever , David Laight , Anna Schumaker , Andy Shevchenko Cc: netdev@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Chang , kernel test robot Subject: [PATCH v4 4/5] nfs: refactor nfs_errorf macros and remove unused ones Date: Sat, 21 Mar 2026 02:09:54 +0800 Message-Id: <20260320180955.150696-5-seanwascoding@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260320180955.150696-1-seanwascoding@gmail.com> References: <20260320180955.150696-1-seanwascoding@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit refactor nfs_errorf() and nfs_ferrorf() to the standard do-while(0) pattern for safer macro expansion and kernel style compliance. additionally, remove nfs_warnf() and nfs_fwarnf() as git grep confirms they have no callers in the current tree. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202603110038.P6d14oxa-lkp@intel.com/ Reviewed-by: Andy Shevchenko Tested-by: Andy Shevchenko Signed-off-by: Sean Chang --- fs/nfs/internal.h | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 63e09dfc27a8..59ab43542390 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -161,13 +161,19 @@ enum nfs_lock_status { NFS_LOCK_NOLOCK = 2, }; -#define nfs_errorf(fc, fmt, ...) ((fc)->log.log ? \ - errorf(fc, fmt, ## __VA_ARGS__) : \ - ({ dprintk(fmt "\n", ## __VA_ARGS__); })) - -#define nfs_ferrorf(fc, fac, fmt, ...) ((fc)->log.log ? \ - errorf(fc, fmt, ## __VA_ARGS__) : \ - ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); })) +#define nfs_errorf(fc, fmt, ...) do { \ + if ((fc)->log.log) \ + errorf(fc, fmt, ## __VA_ARGS__); \ + else \ + dprintk(fmt "\n", ## __VA_ARGS__); \ +} while (0) + +#define nfs_ferrorf(fc, fac, fmt, ...) do { \ + if ((fc)->log.log) \ + errorf(fc, fmt, ## __VA_ARGS__); \ + else \ + dfprintk(fac, fmt "\n", ## __VA_ARGS__); \ +} while (0) #define nfs_invalf(fc, fmt, ...) ((fc)->log.log ? \ invalf(fc, fmt, ## __VA_ARGS__) : \ @@ -177,14 +183,6 @@ enum nfs_lock_status { invalf(fc, fmt, ## __VA_ARGS__) : \ ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); -EINVAL; })) -#define nfs_warnf(fc, fmt, ...) ((fc)->log.log ? \ - warnf(fc, fmt, ## __VA_ARGS__) : \ - ({ dprintk(fmt "\n", ## __VA_ARGS__); })) - -#define nfs_fwarnf(fc, fac, fmt, ...) ((fc)->log.log ? \ - warnf(fc, fmt, ## __VA_ARGS__) : \ - ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); })) - static inline struct nfs_fs_context *nfs_fc2context(const struct fs_context *fc) { return fc->fs_private; -- 2.34.1