[Intel-wired-lan] [PATCH 30/61] net/sunrpc: Prefer IS_ERR_OR_NULL over manual NULL check

[Loktionov, Aleksandr]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf
> Of Philipp Hahn
> Sent: Tuesday, March 10, 2026 12:49 PM
> To: amd-gfx at lists.freedesktop.org; apparmor at lists.ubuntu.com;
> bpf at vger.kernel.org; ceph-devel at vger.kernel.org; cocci at inria.fr; dm-
> devel at lists.linux.dev; dri-devel at lists.freedesktop.org;
> gfs2 at lists.linux.dev; intel-gfx at lists.freedesktop.org; intel-wired-
> lan at lists.osuosl.org; iommu at lists.linux.dev; kvm at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org; linux-block at vger.kernel.org;
> linux-bluetooth at vger.kernel.org; linux-btrfs at vger.kernel.org; linux-
> cifs at vger.kernel.org; linux-clk at vger.kernel.org; linux-
> erofs at lists.ozlabs.org; linux-ext4 at vger.kernel.org; linux-
> fsdevel at vger.kernel.org; linux-gpio at vger.kernel.org; linux-
> hyperv at vger.kernel.org; linux-input at vger.kernel.org; linux-
> kernel at vger.kernel.org; linux-leds at vger.kernel.org; linux-
> media at vger.kernel.org; linux-mips at vger.kernel.org; linux-mm at kvack.org;
> linux-modules at vger.kernel.org; linux-mtd at lists.infradead.org; linux-
> nfs at vger.kernel.org; linux-omap at vger.kernel.org; linux-
> phy at lists.infradead.org; linux-pm at vger.kernel.org; linux-
> rockchip at lists.infradead.org; linux-s390 at vger.kernel.org; linux-
> scsi at vger.kernel.org; linux-sctp at vger.kernel.org; linux-security-
> module at vger.kernel.org; linux-sh at vger.kernel.org; linux-
> sound at vger.kernel.org; linux-stm32 at st-md-mailman.stormreply.com;
> linux-trace-kernel at vger.kernel.org; linux-usb at vger.kernel.org; linux-
> wireless at vger.kernel.org; netdev at vger.kernel.org;
> ntfs3 at lists.linux.dev; samba-technical at lists.samba.org; sched-
> ext at lists.linux.dev; target-devel at vger.kernel.org; tipc-
> discussion at lists.sourceforge.net; v9fs at lists.linux.dev; Philipp Hahn
> <phahn-oss at avm.de>
> Cc: Trond Myklebust <trondmy at kernel.org>; Anna Schumaker
> <anna at kernel.org>; Chuck Lever <chuck.lever at oracle.com>; Jeff Layton
> <jlayton at kernel.org>; NeilBrown <neil at brown.name>; Olga Kornievskaia
> <okorniev at redhat.com>; Dai Ngo <Dai.Ngo at oracle.com>; Tom Talpey
> <tom at talpey.com>; David S. Miller <davem at davemloft.net>; Eric Dumazet
> <edumazet at google.com>; Jakub Kicinski <kuba at kernel.org>; Paolo Abeni
> <pabeni at redhat.com>; Simon Horman <horms at kernel.org>
> Subject: [Intel-wired-lan] [PATCH 30/61] net/sunrpc: Prefer
> IS_ERR_OR_NULL over manual NULL check
> 
> Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL
> check.
> 
> Change generated with coccinelle.
> 
> To: Trond Myklebust <trondmy at kernel.org>
> To: Anna Schumaker <anna at kernel.org>
> To: Chuck Lever <chuck.lever at oracle.com>
> To: Jeff Layton <jlayton at kernel.org>
> To: NeilBrown <neil at brown.name>
> To: Olga Kornievskaia <okorniev at redhat.com>
> To: Dai Ngo <Dai.Ngo at oracle.com>
> To: Tom Talpey <tom at talpey.com>
> To: "David S. Miller" <davem at davemloft.net>
> To: Eric Dumazet <edumazet at google.com>
> To: Jakub Kicinski <kuba at kernel.org>
> To: Paolo Abeni <pabeni at redhat.com>
> To: Simon Horman <horms at kernel.org>
> Cc: linux-nfs at vger.kernel.org
> Cc: netdev at vger.kernel.org
> Cc: linux-kernel at vger.kernel.org
> Signed-off-by: Philipp Hahn <phahn-oss at avm.de>
> ---
>  net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> index
> 9b623849723ed0eb74b827881c6f32d3434c891b..b4d03e59a8202f20360cff1e2e79
> b1e325396517 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -578,7 +578,7 @@ static struct svc_xprt *svc_rdma_accept(struct
> svc_xprt *xprt)
>   errout:
>  	/* Take a reference in case the DTO handler runs */
>  	svc_xprt_get(&newxprt->sc_xprt);
> -	if (newxprt->sc_qp && !IS_ERR(newxprt->sc_qp))
> +	if (!IS_ERR_OR_NULL(newxprt->sc_qp))
>  		ib_destroy_qp(newxprt->sc_qp);
>  	rdma_destroy_id(newxprt->sc_cm_id);
>  	rpcrdma_rn_unregister(dev, &newxprt->sc_rn); @@ -608,7 +608,7
> @@ static void svc_rdma_free(struct svc_xprt *xprt)
>  	might_sleep();
> 
>  	/* This blocks until the Completion Queues are empty */
> -	if (rdma->sc_qp && !IS_ERR(rdma->sc_qp))
> +	if (!IS_ERR_OR_NULL(rdma->sc_qp))
>  		ib_drain_qp(rdma->sc_qp);
>  	flush_workqueue(svcrdma_wq);
> 
> @@ -619,16 +619,16 @@ static void svc_rdma_free(struct svc_xprt *xprt)
>  	svc_rdma_recv_ctxts_destroy(rdma);
> 
>  	/* Destroy the QP if present (not a listener) */
> -	if (rdma->sc_qp && !IS_ERR(rdma->sc_qp))
> +	if (!IS_ERR_OR_NULL(rdma->sc_qp))
>  		ib_destroy_qp(rdma->sc_qp);
> 
> -	if (rdma->sc_sq_cq && !IS_ERR(rdma->sc_sq_cq))
> +	if (!IS_ERR_OR_NULL(rdma->sc_sq_cq))
>  		ib_free_cq(rdma->sc_sq_cq);
> 
> -	if (rdma->sc_rq_cq && !IS_ERR(rdma->sc_rq_cq))
> +	if (!IS_ERR_OR_NULL(rdma->sc_rq_cq))
>  		ib_free_cq(rdma->sc_rq_cq);
> 
> -	if (rdma->sc_pd && !IS_ERR(rdma->sc_pd))
> +	if (!IS_ERR_OR_NULL(rdma->sc_pd))
>  		ib_dealloc_pd(rdma->sc_pd);
> 
>  	/* Destroy the CM ID */
> 
> --
> 2.43.0

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov at intel.com>