2022-10-12 18:45:13

by Jeff Layton

Subject: [PATCH] nfsd: ensure we always call fh_verify_error tracepoint

From: Jeff Layton <[email protected]>

This is a conditional tracepoint. Call it every time, not just when
nfs_permission fails.

Signed-off-by: Jeff Layton <[email protected]>
---
fs/nfsd/nfsfh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 9c1f697ffc72..43bb34f1458e 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -392,8 +392,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)
skip_pseudoflavor_check:
/* Finally, check access permissions. */
error = nfsd_permission(rqstp, exp, dentry, access);
- trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
out:
+ trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
if (error == nfserr_stale)
nfsd_stats_fh_stale_inc(exp);
return error;
--
2.37.3

2022-10-13 16:17:45

by Chuck Lever III

Subject: Re: [PATCH] nfsd: ensure we always call fh_verify_error tracepoint

> On Oct 12, 2022, at 2:42 PM, [email protected] wrote:
>
> From: Jeff Layton <[email protected]>
>
> This is a conditional tracepoint. Call it every time, not just when
> nfs_permission fails.
>
> Signed-off-by: Jeff Layton <[email protected]>

I've applied this to nfsd's for-rc. Thanks!


> ---
> fs/nfsd/nfsfh.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
> index 9c1f697ffc72..43bb34f1458e 100644
> --- a/fs/nfsd/nfsfh.c
> +++ b/fs/nfsd/nfsfh.c
> @@ -392,8 +392,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)
> skip_pseudoflavor_check:
> /* Finally, check access permissions. */
> error = nfsd_permission(rqstp, exp, dentry, access);
> - trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
> out:
> + trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
> if (error == nfserr_stale)
> nfsd_stats_fh_stale_inc(exp);
> return error;
> --
> 2.37.3
>

--
Chuck Lever