nfsd: delete unnecessary NULL check in __fh_verify()
Subsystems (3)
PATCH 1/1 nfsd: delete unnecessary NULL check in __fh_verify()
In commit 4a0de50a44bb ("nfsd: decouple the xprtsec policy check from check_nfsd_access()") we added a NULL check on "rqstp" to earlier in the function. This check is no longer required so delete it.
--- fs/nfsd/nfsfh.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/nfsd/nfsfh.c +1 -3
@@ -403,9 +403,7 @@ __fh_verify(struct svc_rqst *rqstp,if (error) goto out; -/* During LOCALIO call to fh_verify will be called with a NULL rqstp */ -if (rqstp) -svc_xprt_set_valid (rqstp->rq_xprt); +svc_xprt_set_valid (rqstp->rq_xprt); check_permissions:/* Finally, check access permissions. */
Signature · 1 line
2.47.2
Quoted 5 lines · Dan Carpenter
In commit
4a0de50a44bb("nfsd: decouple the xprtsec policy check fromcheck_nfsd_access()") we added a NULL check on "rqstp" to earlier in the function. This check is no longer required so delete it.Signed-off-by Dan Carpenter <[email protected]>
-Scott
Quoted 22 lines
--- fs/nfsd/nfsfh.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)fs/nfsd/nfsfh.c +1
-3@@ -403,9 +403,7 @@ __fh_verify(struct svc_rqst *rqstp,if (error) goto out; -/* During LOCALIO call to fh_verify will be called with a NULL rqstp */ -if (rqstp) -svc_xprt_set_valid (rqstp->rq_xprt); +svc_xprt_set_valid (rqstp->rq_xprt); check_permissions:/* Finally, check access permissions. */ Signature · 1 line
2.47.2
Chuck Lever
maintainerFrom: Chuck Lever <[email protected]>
Quoted 5 lines · Dan Carpenter
In commit
4a0de50a44bb("nfsd: decouple the xprtsec policy check fromcheck_nfsd_access()") we added a NULL check on "rqstp" to earlier in the function. This check is no longer required so delete it.
Applied to nfsd-testing, thanks!
[1/1] nfsd: delete unnecessary NULL check in __fh_verify()
commit: ec3d9745c6a3f41658d17873e4890b56cc27f9c8
--
Chuck Lever