Re: [PATCH] nfsd: delete unnecessary NULL check in __fh_verify()

From: Scott Mayhew
Date: Thu Sep 04 2025 - 15:27:18 EST


On Thu, 04 Sep 2025, Dan Carpenter wrote:

> 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 <dan.carpenter@xxxxxxxxxx>

Reviewed-by: Scott Mayhew <smayhew@xxxxxxxxxx>

-Scott
> ---
> fs/nfsd/nfsfh.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> 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. */
> --
> 2.47.2
>