From nobody Mon Apr 6 10:30:18 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 E929F33A9C4 for ; Thu, 19 Mar 2026 14:18:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929942; cv=none; b=Agk2Clnp9PlaTa4VOWTylq+wN7nBWGmq6UdFFUF8WLcWP+sDoNqglNB8r0pGp2fHIH5pCAhxm1voy8du/x1ZPSIKQuJGNdipq8NWwMxW/hFe2xgNwCwN7rGLtgOHhYOk5yWc4v0L5cfaqTDqAdCKC3eb2ACyWNjt8rjSTsnX07s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929942; c=relaxed/simple; bh=CZYrSzJxOTHz3y2+Yn1YrwZjKF3A8fsmk9txEkZG5Eg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q48ZBUA8Ti2s/LTO3KFv7UTKa/h4sibFR81tLf2b7YiPceCEVsgkiaqjNGAHjWDFXqDVremsWBWtEvyQbTIaDQp87LhXzX0/GEOIYBSlofpQXRwkqWSwM884CCeMVk3vkBVPq0j0qOtOAyM0DpY9xGFUKRM/8lu1B3OfupPNK+Y= 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=IoyyoVzv; arc=none smtp.client-ip=209.85.216.41 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="IoyyoVzv" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-3567e2b4159so693903a91.0 for ; Thu, 19 Mar 2026 07:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773929939; x=1774534739; 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=capsefnRJybIkJWvu7BICDZ5yODeSG4sK/v0sJ/qwmE=; b=IoyyoVzvsECxsP3yv/jixu1xEUc/cgocezdoKmVWuXp0Z5rRzv3o/JxdFV4Xq4m266 prQFtBludIfcXysyglZ8iVOoBZorKAtZoCRwi2Z23hljNc+Otx1X+ylZCvCjNCtqy3Fk 43fNNyX0gI7suCp4B/C+YwEMuApLmBnC69qjNTCBELC+2GY8l/nxUuW73Ikub1faFbEN nzQOAjYlJ0Oc+XzXaVegPy3Bf7KTWMzqfuI15pgql2/lymvShhG5pBTs9vmzPwJh0EIG rsghQiht5C9TziQNoIcuUk/9RAxk/h+PCgTUsFW1P8OIolNs2jjv6wRLcyTafp56uMWx HfcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773929939; x=1774534739; 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=capsefnRJybIkJWvu7BICDZ5yODeSG4sK/v0sJ/qwmE=; b=ImNwr6Xc8TVIhaf2KEeMW88LVwR4I2SAhxT1/Zki0nZFo/W7QCpYrNsgONHVhlgXZm 8EMeeub4LAzGU8m2tV+4bfDblBnIUZNNbL00UAxU+OdMfKvm1XPKl28tMgUWrHPoFoPZ qqO33ISAOL1BOp8aR7H/flcwAfOwteFvPb7aArDCVKj5TyiW0c3TxBczP573Qi8yS0P9 mzagicE/lwkkgmVhFOrWP5tRrtUTStFq8JGVtBxQwPjFjZ9MufqTJABEulcOKLRjXLUB leOqNFTE4IzLqKi6fNeMtwfkr64cS6/eA4KpoO4xm8aTX7vBeBnzkCTQm56IOaOFzfHo loWg== X-Forwarded-Encrypted: i=1; AJvYcCUMwjN7EBZboaWqPbS9jr/M5P/pg5m6hDsKMUQ+WNm5DV7j3uPQGgaz6LHzlX4rLT/6KadEd9eILURLjVg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4G8P6XBNjx9UYNgt/6FlZX56sdhVhi/alkauer9BE/6fgJdYz s/+C/9h9fclPJk26trS8Q/GpB73kCNcfZjLYn5pmZXu2lNq/4/dZurVY X-Gm-Gg: ATEYQzzzN7VFvpk8NtwANLOcRZrtdL0Wz7uJy+BAQDBqYWphAcVA3EThDMRs5Ymgjyw SjoE1tDAn8m+sop+Yl/sEw/C2Weig4/jcC3wpzUncqXOVMI41gGsF6CWE68NNB/hVn8aPVRq3xf hyTNx1c/KCzMMnDGUUwyToZGItrYT7gqPrmuXYh8dHjO9gtkTiZ/rtrCgD+Tbz50QzxegoUw1Zg BvpLYIhEtRmEFPrAqfIjjc2KOOL3A8jzweOxvs5+pFflyw/NqDOxrVGbVOmwbDWioRt+vdZfOEP mHvn1od2O9tSX2SyprLd23LAMXHWUNzmIVB5fBYJxQC1goYGCCVhzYaYF5lW4QQoboWePrQ/dq6 1bfcoFbaWWpsdkThpXQ6mxHC9WaJcgApQ+6yEiCchLD66VIR3xA4wJlZrCmEnGz0NxxsVgqWtPh Rh3tzRpo6NzyLDQIg30aZfRpRaNErl3aBnPup7MmsOEOgHSvesR03quNBqg2/Mndaaa5zJazPqr 4MuWk8u7A== X-Received: by 2002:a17:90b:35c2:b0:35a:3e2:7cbb with SMTP id 98e67ed59e1d1-35bb9f2bf01mr6280190a91.29.1773929939183; Thu, 19 Mar 2026 07:18:59 -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-35bc63286ebsm2695321a91.17.2026.03.19.07.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 07:18:58 -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 Subject: [PATCH v3 1/3] nfsd/lockd: Remove redundant debug checks Date: Thu, 19 Mar 2026 22:18:44 +0800 Message-Id: <20260319141846.78222-2-seanwascoding@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260319141846.78222-1-seanwascoding@gmail.com> References: <20260319141846.78222-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unnecessary IS_ENABLED(CONFIG_SUNRPC_DEBUG) guards and #ifdefs in nfsfh.c and svclock.c. Verification with .lst files under -O2 confirms that the compiler successfully performs "dead code elimination". Even when variables (like char buf[] in nfsfh.c) or static helper functions (like nlmdbg_cookie2a() in svclock.c) are declared without #ifdef, they are completely optimized out (no stack allocation, no symbol references in the final executable) as they are only referenced within no_printk(). Suggested-by: Andrew Lunn Signed-off-by: Sean Chang --- fs/lockd/svclock.c | 7 ------- fs/nfsd/nfsfh.c | 8 +++----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index ee23f5802af1..9b978a087b3c 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -47,7 +47,6 @@ static const struct rpc_call_ops nlmsvc_grant_ops; static LIST_HEAD(nlm_blocked); static DEFINE_SPINLOCK(nlm_blocked_lock); =20 -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) { /* @@ -74,12 +73,6 @@ static const char *nlmdbg_cookie2a(const struct nlm_cook= ie *cookie) =20 return buf; } -#else -static inline const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) -{ - return "???"; -} -#endif =20 /* * Insert a blocked lock into the global list diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 68b629fbaaeb..91514326d1b4 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -105,12 +105,10 @@ static __be32 nfsd_setuser_and_check_port(struct svc_= rqst *rqstp, { /* Check if the request originated from a secure port. */ if (rqstp && !nfsd_originating_port_ok(rqstp, cred, exp)) { - if (IS_ENABLED(CONFIG_SUNRPC_DEBUG)) { - char buf[RPC_MAX_ADDRBUFLEN]; + char buf[RPC_MAX_ADDRBUFLEN]; =20 - dprintk("nfsd: request from insecure port %s!\n", - svc_print_addr(rqstp, buf, sizeof(buf))); - } + dprintk("nfsd: request from insecure port %s!\n", + svc_print_addr(rqstp, buf, sizeof(buf))); return nfserr_perm; } =20 --=20 2.34.1 From nobody Mon Apr 6 10:30:18 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 9100F36165D for ; Thu, 19 Mar 2026 14:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929944; cv=none; b=Us7FiS1cHK96BCEKB4+b5TEs3AbThBYu8GfjPGxtJJ4GH6rB/wtun+y5nxMmrY8KVdUcbcIy+zv7w/uURQarlUVTPCKdWbNgU+3pC7AFIw0x/CZA21dqJkSa2WOKgJ3Lk3pBLdxCO9WYltu6MOCiqWKxaWhs0GdgZrwZ0g0KM/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929944; c=relaxed/simple; bh=Bj04iTXB7MhKSrOnlUvWs1/LZRy/U40aj1lrebnr4kE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dnUsMrbzaZ/eHEHQ3OCLdxAoJZ8cj3ubY61jumyO9j2biywiKfgqEZfAYm7CZeBqvypMulz9vUk/iSUeIjaOJXi8kXDPi0raR8ZQWXYYIkZTwZxZh4ckO/zjdPLjVqyd5G9ePZ8ScNLqz8GT9t3qnfvlhbSjii6kaF0sj0FOpCc= 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=R81D17Cd; arc=none smtp.client-ip=209.85.216.50 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="R81D17Cd" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-356337f058aso421556a91.2 for ; Thu, 19 Mar 2026 07:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773929942; x=1774534742; 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=TOf9LcnO5IRemgfOLwtBwbNVtgVrreL+MONpjgDCJOc=; b=R81D17CdNHfsMNlMgTTSiDVNzGT4uUxmExPFqk3TUP6Y9NUw9Mv1LvneXLDnPsaefG nh1FpnsAMLu+Oq1wqTiVQgbkdwnH/TD2afQEMBNo/qAUhz1J2gT3bcZcmUedPXBveMzU MVxeZ8QYAH5G4Z+NlY/mnZK6D6xbQyYRQW9F0XTZVodLh95X7VJJP3TKh7QlUvMDvmBJ 5Q1VairZ1Jruodd++GeGk3A9f+XvBGe/bm5Eh+bj1uj3p9sKKZ5OLQOYjnkFeeLBSWon WNBGr9wN4F6YvR2YhIVMML9R62jjECS+T+xoQ2qdqmDx8XmPVjKcwj7sGlQDwPoNuo0J vxgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773929942; x=1774534742; 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=TOf9LcnO5IRemgfOLwtBwbNVtgVrreL+MONpjgDCJOc=; b=ZNH03Kgq63zSpPHqE9Cam2DuDbsngOOnoBptS1O5N4bbKFs5gJ0RcjnO9zTUCDNpEH 3UrwjDn+3u2fE22AsXM3bnE9MuHXl0kVAtroVWHi2eJRyzZut+JfP4ix+TtF0Z1hdswY IPylFU1/LP4EBqnTca4HdMknxzuW4LWCt3aHXMlbmu8sJr+4dHUeMSwQy5cIBYNRfZyR 1UMY96xdCWWNZ3o5NJ/EzSv8kE9UeIyGjNIlGxw1erLN3H+iLp/WoPe77hqMzCn/JuE6 EoJOKLE+fYEVDzzgxPYF9Wmocl0GrQc39HMyKrw1rOG5t6FcZbq9GjzK1LluAcRGY9pq TGPw== X-Forwarded-Encrypted: i=1; AJvYcCWfbHKCZoF/4/d37/BegtVeyLEYSFNyhLRqPmuZuFTicwXXwvafCepEEwyvDcl8u9lUysVZ+rQw3NKQ15E=@vger.kernel.org X-Gm-Message-State: AOJu0Yxuo5CQ13Ol3lLhazVlfR0+kft9E4LvwlzqkFKw05O30peCNiIa ysdU/HhKmNPnFwpgN6Lqvwkr0xNteHljkYpxZpIiRS1ljLd/VenxbEPPEt10Gw== X-Gm-Gg: ATEYQzwXoMaf6J813j3/bzbKPLLVE5/QYFQMXensruAgzpjHs20U4MNYxc1zbl9B4ZR GpSNDmsuY3aMAGcGwFgwC6n2xjBBW1hwn1hIW4SN4wucWPu+SBt9kPpbUDB/ydzL6otZjOPqBO7 otShnPJp1aUBEcsB7bebZkmjA5T7dff2Led9ZVBV/dfMuyUcoynCrXnRIKNfa5qlpZJPU/2uR+w rTUdxuK+nNufTMGUhB3Bz/oY3VnmjQe0ijVPxoHYyW/UErRdgQ3VXZgo7QFhc0BQ57+Y6BDLye1 CkCGaJ4liw/6JHMhX2zT5V+IRwXyejoxat/9RvSe6elb+t1uUb/xHjyv9DoeqeC0YxQ0gmncnZ2 QshWkP7uyOwymdjVkWWQUUGYIaZwLhNFai2YpCaHyBhKcyFpxsWxZ1dgkD4VCF+6yOEfi7LH1sX 1yeG/yTAcap+uky5e1LYtsvzE8OE9OB122ybsKMGNe3RylQeRaNPqaqrcFKgEtLx0Kw7y+TLNez zZhg1o9pg== X-Received: by 2002:a17:90a:d604:b0:35a:24f3:2c88 with SMTP id 98e67ed59e1d1-35bb9e579c5mr6654313a91.8.1773929941824; Thu, 19 Mar 2026 07:19:01 -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-35bc63286ebsm2695321a91.17.2026.03.19.07.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 07:19:01 -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 Subject: [PATCH v3 2/3] svcrdma: remove redundant IS_ENABLED(CONFIG_SUNRPC_DEBUG) guards Date: Thu, 19 Mar 2026 22:18:45 +0800 Message-Id: <20260319141846.78222-3-seanwascoding@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260319141846.78222-1-seanwascoding@gmail.com> References: <20260319141846.78222-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: quoted-printable Content-Type: text/plain; charset="utf-8" Remove redundant IS_ENABLED(CONFIG_SUNRPC_DEBUG) guards in svc_rdma_accept(). Since dprintk() already evaluates to a no-op (via no_printk) when debugging is disabled, these explicit guards are unnecessary. Verification with .lst files under -O2 confirms that the compiler successfully performs "dead code elimination". Even when variables (like 'sap' in this case) are declared outside of #ifdef, they are completely optimized out (no stack allocation, no symbol references in the final executable) as they are only referenced within dprintk(). Signed-off-by: Sean Chang --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 25 +++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma= /svc_rdma_transport.c index f2d72181a6fe..0759444bda50 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -413,6 +413,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt= *xprt) struct rpcrdma_connect_private pmsg; struct ib_qp_init_attr qp_attr; struct ib_device *dev; + struct sockaddr *sap; int ret =3D 0; =20 listen_rdma =3D container_of(xprt, struct svcxprt_rdma, sc_xprt); @@ -559,20 +560,16 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xp= rt *xprt) goto errout; } =20 - if (IS_ENABLED(CONFIG_SUNRPC_DEBUG)) { - struct sockaddr *sap; - - dprintk("svcrdma: new connection accepted on device %s:\n", dev->name); - sap =3D (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; - dprintk(" local address : %pIS:%u\n", sap, rpc_get_port(sap)); - sap =3D (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; - dprintk(" remote address : %pIS:%u\n", sap, rpc_get_port(sap)); - dprintk(" max_sge : %d\n", newxprt->sc_max_send_sges); - dprintk(" sq_depth : %d\n", newxprt->sc_sq_depth); - dprintk(" rdma_rw_ctxs : %d\n", ctxts); - dprintk(" max_requests : %d\n", newxprt->sc_max_requests); - dprintk(" ord : %d\n", conn_param.initiator_depth); - } + dprintk("svcrdma: new connection accepted on device %s:\n", dev->name); + sap =3D (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; + dprintk(" local address : %pIS:%u\n", sap, rpc_get_port(sap)); + sap =3D (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; + dprintk(" remote address : %pIS:%u\n", sap, rpc_get_port(sap)); + dprintk(" max_sge : %d\n", newxprt->sc_max_send_sges); + dprintk(" sq_depth : %d\n", newxprt->sc_sq_depth); + dprintk(" rdma_rw_ctxs : %d\n", ctxts); + dprintk(" max_requests : %d\n", newxprt->sc_max_requests); + dprintk(" ord : %d\n", conn_param.initiator_depth); =20 return &newxprt->sc_xprt; =20 --=20 2.34.1 From nobody Mon Apr 6 10:30:18 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 E7402370D7C for ; Thu, 19 Mar 2026 14:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929947; cv=none; b=FmmWup13e3Fc8k8LfZLLVbrALAwVz7elDmoh8hGQS9wRywTZomGfRcXgX0puty+TFP27ml1ZPLCcF96F+dhUjYMBX4SSZPy99/ZlzNZ6L7Zwrgy2kEaw2oCT8H1c3QllxcvlI2oD5D0dHuUEnBuzN84fifL5eL1S7yOc59x6HDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929947; c=relaxed/simple; bh=LyOAcv8pOrNZtKwp9vpRm97qmAqdwUyyyBfIQEjIiu8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WlmlKu1qabkU/qMIUf0PG5HQpIPzN/tM0FsihAINhS98994z7ze8QlpfnCHSlZ7hH6/kVVAwQrHagS6fXvKfRrpV7vIGBxBTDX87GeNIZu36YF7RT7NpYkuZ79l9kxgEMmzM+wtmQ+1nJ7gi7zKDX1ihISjT2S/d/cr6oa4q9LA= 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=W82Arv4k; arc=none smtp.client-ip=209.85.216.44 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="W82Arv4k" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-35b95a7444bso692749a91.1 for ; Thu, 19 Mar 2026 07:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773929945; x=1774534745; 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=Juaqw75BGT6mprObL/AlBCbjvTBGCqm62mz9LEt4i84=; b=W82Arv4kxLwqLKYHBB/lchtnVYurezipBWqBFyKDxSwo/HTQ51mxBuVe3Z0pzSPG4X JfeYCRB9EGUuK3aZ6po5Ng/l/sgotiyxNtU7qoexZ6BW83PQN3/8rrwxC6XK5gZxkylx Df7OBNFbqXATubwo/KvBpGliLe/0q6amFmc45DoWFlXEAgnNBP5djdnTc87N1zoXF3hg OR9UyqDIGnABl8YwlJ/uBXoLcNdSzpGYYKldw5by9gDiiVNUIfTy6qEBMN4raf22C1LY VJ8BLJaePMS3atG0szN1ZlZY9JVYKiu42GToApobB2i2LrdVkW421yxBP1DBgZFmBM58 W6dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773929945; x=1774534745; 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=Juaqw75BGT6mprObL/AlBCbjvTBGCqm62mz9LEt4i84=; b=PEpyIH33qvcuVtbcODVbWYybzo5jJN4iDLAjMFizfVtPdSZAwGER7OGYVM8QPaVsJ5 ayHvWAgkQj3HmCdPOYstJ9Oe0PmXITvZTkSUZYhoJeidqtuWMZUo4wfQ54V9wVW7jTOx 06cseIVwBte4dwTpBNNhOuy6DycWOuX2ncfCFyNlg+4feYnwYycULgYU1hRHR17YQs17 JKflzBG7ssuF7ZbWnBxsjhgY6T4lTj7OlSmz1cUL2SZ+XYMthQUNYcDH352aKfrkDD6K Fgbyv5j1oRad+Z4CffwSuJ2ROoBEZBgAEeQP92PVkphxnNvLglgpO6LwAAwPRQq35v4m Q2Ug== X-Forwarded-Encrypted: i=1; AJvYcCU1E3d164f0lhSsUNYxnHFU/eDKD2Fajz/5vLYoNm3Dmp44aOSCNhdBxyMmvXGvesrurO2WfGwzxNRL8aU=@vger.kernel.org X-Gm-Message-State: AOJu0YzkzDsbilX+0uDUBsqAPGRE3eFRvWbmwCqxK3u5UqvnxJHi69lQ E993OUOKylJTiufigm/If1hZjb9sbP0NHpMhuw38NVlJrF7CAuUzQCr9IWDHcw== X-Gm-Gg: ATEYQzyKXl1N3bHuijI2Q0C8qvymMopkiMJUw9PDojyhB4t2XntrsM4lm7tWqK7eZn9 0rrWBy9SpfH0p4OEuh+fYazl+WYp7EyPUMncHgXxpagIygtnQpO+5qc2V/2cGrfYt+Z7OnKUi02 cDNawlcLtk/Nb2NcLnwaNhvUbXBW3mYG7pct9k7UAexIMmtG8LVILF+GAatDmOvj26f+H5cARcE ZFE9mMCB7k+o9MIzSiv68FdmaEmAttFUq+6WN3XdCBGikgtAh/b/TJM0qwkR9DKEvt/ieyNQVvm zpqaVPIbDcepM4asNKMVPliiixflGUush8TVrreJlelXN64A2G+GnvROlFoD+SjDp1Tts/fJIdB n/S+UfMrPoCYSwyXPGeBXzKfDQ8Prr0iF8w69NT6YYnmBOwi+lUGDSP/5K4oPjIUHzf6+AzHY9n bNOfN9cxbtOIW5Ucpgh6vzUdUUFLjgYVFCp/oq/7M9vLjYQl+UaQomp3DQoBR3cyYhy/qxx5A= X-Received: by 2002:a17:90b:3d8e:b0:359:f2e1:5906 with SMTP id 98e67ed59e1d1-35bb9e456a3mr6473615a91.4.1773929945118; Thu, 19 Mar 2026 07:19:05 -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-35bc63286ebsm2695321a91.17.2026.03.19.07.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 07:19:04 -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 v3 3/3] nfs: refactor nfs_errorf macros and remove unused ones Date: Thu, 19 Mar 2026 22:18:46 +0800 Message-Id: <20260319141846.78222-4-seanwascoding@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260319141846.78222-1-seanwascoding@gmail.com> References: <20260319141846.78222-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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@int= el.com/ Signed-off-by: Sean Chang Reviewed-by: Andy Shevchenko Tested-by: Andy Shevchenko --- 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 =3D 2, }; =20 -#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) =20 #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; })) =20 -#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_contex= t *fc) { return fc->fs_private; --=20 2.34.1