summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-11-17 20:04:50 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-11-17 20:04:50 +0300
commit81ac25651a62c958bb0e074e0d4e25060ea557dd (patch)
tree8f2b39c843abeb04a85b2b7e4df7b7c2de2383b6 /fs
parent847ccab8fdcf4a0cd85a278480fab1ccdc9f6136 (diff)
parent5a01c805441bdc86e7af206d8a03735cc9394ffb (diff)
downloadlinux-81ac25651a62c958bb0e074e0d4e25060ea557dd.tar.xz
Merge tag 'nfsd-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever: - Fix another tracepoint crash * tag 'nfsd-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: NFSD: Fix trace_nfsd_fh_verify_err() crasher
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/trace.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 06a96e955bd0..d4b6839bb459 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -254,7 +254,10 @@ TRACE_EVENT_CONDITION(nfsd_fh_verify_err,
rqstp->rq_xprt->xpt_remotelen);
__entry->xid = be32_to_cpu(rqstp->rq_xid);
__entry->fh_hash = knfsd_fh_hash(&fhp->fh_handle);
- __entry->inode = d_inode(fhp->fh_dentry);
+ if (fhp->fh_dentry)
+ __entry->inode = d_inode(fhp->fh_dentry);
+ else
+ __entry->inode = NULL;
__entry->type = type;
__entry->access = access;
__entry->error = be32_to_cpu(error);