-----Original Message-----
From: Intel-wired-lan <redacted> On Behalf
Of Philipp Hahn
Sent: Tuesday, March 10, 2026 12:49 PM
To: amd-gfx@lists.freedesktop.org; apparmor@lists.ubuntu.com;
bpf@vger.kernel.org; ceph-devel@vger.kernel.org; cocci@inria.fr; dm-
devel@lists.linux.dev; dri-devel@lists.freedesktop.org;
gfs2@lists.linux.dev; intel-gfx@lists.freedesktop.org; intel-wired-
lan@lists.osuosl.org; iommu@lists.linux.dev; kvm@vger.kernel.org;
linux-arm-kernel@lists.infradead.org; linux-block@vger.kernel.org;
linux-bluetooth@vger.kernel.org; linux-btrfs@vger.kernel.org; linux-
cifs@vger.kernel.org; linux-clk@vger.kernel.org; linux-
erofs@lists.ozlabs.org; linux-ext4@vger.kernel.org; linux-
fsdevel@vger.kernel.org; linux-gpio@vger.kernel.org; linux-
hyperv@vger.kernel.org; linux-input@vger.kernel.org; linux-
kernel@vger.kernel.org; linux-leds@vger.kernel.org; linux-
media@vger.kernel.org; linux-mips@vger.kernel.org; linux-mm@kvack.org;
linux-modules@vger.kernel.org; linux-mtd@lists.infradead.org; linux-
nfs@vger.kernel.org; linux-omap@vger.kernel.org; linux-
phy@lists.infradead.org; linux-pm@vger.kernel.org; linux-
rockchip@lists.infradead.org; linux-s390@vger.kernel.org; linux-
scsi@vger.kernel.org; linux-sctp@vger.kernel.org; linux-security-
module@vger.kernel.org; linux-sh@vger.kernel.org; linux-
sound@vger.kernel.org; linux-stm32@st-md-mailman.stormreply.com;
linux-trace-kernel@vger.kernel.org; linux-usb@vger.kernel.org; linux-
wireless@vger.kernel.org; netdev@vger.kernel.org;
ntfs3@lists.linux.dev; samba-technical@lists.samba.org; sched-
ext@lists.linux.dev; target-devel@vger.kernel.org; tipc-
discussion@lists.sourceforge.net; v9fs@lists.linux.dev; Philipp Hahn
[off-list ref]
Cc: Eric Van Hensbergen <ericvh@kernel.org>; Latchesar Ionkov
[off-list ref]; Dominique Martinet [off-list ref];
Christian Schoenebeck [off-list ref]; David S. Miller
[off-list ref]; Eric Dumazet [off-list ref]; Jakub
Kicinski [off-list ref]; Paolo Abeni [off-list ref]; Simon
Horman [off-list ref]
Subject: [Intel-wired-lan] [PATCH 24/61] net/9p: 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: Eric Van Hensbergen <ericvh@kernel.org>
To: Latchesar Ionkov <lucho@ionkov.net>
To: Dominique Martinet <asmadeus@codewreck.org>
To: Christian Schoenebeck <linux_oss@crudebyte.com>
To: "David S. Miller" <davem@davemloft.net>
To: Eric Dumazet <edumazet@google.com>
To: Jakub Kicinski <kuba@kernel.org>
To: Paolo Abeni <pabeni@redhat.com>
To: Simon Horman <horms@kernel.org>
Cc: v9fs@lists.linux.dev
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Philipp Hahn <redacted>
---
 include/net/9p/client.h | 2 +-
 net/9p/trans_rdma.c     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/net/9p/client.h b/include/net/9p/client.h index

838a94218b593f3fb19e6827c472753380193461..4bde6bd716f323c819745e64c7aa
c0dea7beb72f 100644

--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h

@@ -364,7 +364,7 @@ static inline struct p9_fid *p9_fid_get(struct

p9_fid *fid)

 static inline int p9_fid_put(struct p9_fid *fid)  {
-	if (!fid || IS_ERR(fid))
+	if (IS_ERR_OR_NULL(fid))
 		return 0;

 	if (tracepoint_enabled(9p_fid_ref))

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index

aa5bd74d333f3b5e6fd1e4344d26bc0201ff7f7f..60461344b536bcb6e94112aace75
a88b6a99ad86 100644

--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c

@@ -252,16 +252,16 @@ static void rdma_destroy_trans(struct

p9_trans_rdma *rdma)
 	if (!rdma)
 		return;

-	if (rdma->qp && !IS_ERR(rdma->qp))
+	if (!IS_ERR_OR_NULL(rdma->qp))
 		ib_destroy_qp(rdma->qp);

-	if (rdma->pd && !IS_ERR(rdma->pd))
+	if (!IS_ERR_OR_NULL(rdma->pd))
 		ib_dealloc_pd(rdma->pd);

-	if (rdma->cq && !IS_ERR(rdma->cq))
+	if (!IS_ERR_OR_NULL(rdma->cq))
 		ib_free_cq(rdma->cq);

-	if (rdma->cm_id && !IS_ERR(rdma->cm_id))
+	if (!IS_ERR_OR_NULL(rdma->cm_id))
 		rdma_destroy_id(rdma->cm_id);

 	kfree(rdma);

--
2.43.0