| Message ID | 20221012184254.30539-1-jlayton@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: ensure we always call fh_verify_error tracepoint | expand |
> On Oct 12, 2022, at 2:42 PM, jlayton@kernel.org wrote: > > From: Jeff Layton <jlayton@kernel.org> > > This is a conditional tracepoint. Call it every time, not just when > nfs_permission fails. > > Signed-off-by: Jeff Layton <jlayton@kernel.org> 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
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;