Commit 81ac2565 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 847ccab8 5a01c805

fs/nfsd/trace.h

+4 −1
Original line number Diff line number Diff line
@@ -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);

		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);