From: Yan Zhen <yanzhen@vivo.com>
To: davem@davemloft.net, chuck.lever@oracle.com, jlayton@kernel.org,
trondmy@kernel.org, anna@kernel.org, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com
Cc: neilb@suse.de, okorniev@redhat.com, Dai.Ngo@oracle.com,
tom@talpey.com, linux-nfs@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
opensource.kernel@vivo.com, Yan Zhen <yanzhen@vivo.com>
Subject: [PATCH v3] sunrpc: Fix error checking for d_hash_and_lookup()
Date: Wed, 28 Aug 2024 12:43:55 +0800 [thread overview]
Message-ID: <20240828044355.590260-1-yanzhen@vivo.com> (raw)
The d_hash_and_lookup() function returns either an error pointer or NULL.
It might be more appropriate to check error using IS_ERR_OR_NULL().
Fixes: 4b9a445e3eeb ("sunrpc: create a new dummy pipe for gssd to hold open")
Signed-off-by: Yan Zhen <yanzhen@vivo.com>
---
Changes in v3:
- Rewrite the "fixes".
- Using ERR_CAST(gssd_dentry) instead of ERR_PTR(-ENOENT).
net/sunrpc/rpc_pipe.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 910a5d850d04..13e905f34359 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -1306,8 +1306,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
/* We should never get this far if "gssd" doesn't exist */
gssd_dentry = d_hash_and_lookup(root, &q);
- if (!gssd_dentry)
- return ERR_PTR(-ENOENT);
+ if (IS_ERR_OR_NULL(gssd_dentry))
+ return ERR_CAST(gssd_dentry);
ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL);
if (ret) {
@@ -1318,7 +1318,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
q.name = gssd_dummy_clnt_dir[0].name;
q.len = strlen(gssd_dummy_clnt_dir[0].name);
clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
- if (!clnt_dentry) {
+ if (IS_ERR_OR_NULL(clnt_dentry)) {
__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
pipe_dentry = ERR_PTR(-ENOENT);
goto out;
--
2.34.1
next reply other threads:[~2024-08-28 4:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-28 4:43 Yan Zhen [this message]
2024-08-28 10:18 ` [PATCH v3] sunrpc: Fix error checking for d_hash_and_lookup() Jeff Layton
2024-08-28 22:20 ` NeilBrown
2024-08-29 9:49 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240828044355.590260-1-yanzhen@vivo.com \
--to=yanzhen@vivo.com \
--cc=Dai.Ngo@oracle.com \
--cc=anna@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jlayton@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=okorniev@redhat.com \
--cc=opensource.kernel@vivo.com \
--cc=pabeni@redhat.com \
--cc=tom@talpey.com \
--cc=trondmy@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox