From: Dan Carpenter Date: Thu, 4 Sep 2025 18:59:30 +0000 (+0300) Subject: nfsd: delete unnecessary NULL check in __fh_verify() X-Git-Tag: v6.18-rc1~54^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eafdd7e949bb412bb6daa1f8c71b61d11c23ca5f;p=thirdparty%2Fkernel%2Fstable.git 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. Signed-off-by: Dan Carpenter Reviewed-by: Scott Mayhew Signed-off-by: Chuck Lever --- diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 062cfc18d8c6..3edccc38db42 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -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. */