diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2018-03-27 10:52:43 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-04-03 15:08:13 -0400 |
| commit | afa720a0910bd0fe4a714ab9b902ff6e845900c3 (patch) | |
| tree | b76eace46040f90ffbc690ca2ca111c508bb7d33 /fs/nfsd | |
| parent | 55f5088c22cc83dbc64394abfbf76cd1ff5e7cd0 (diff) | |
nfsd: Fix NFSD trace points
nfsd-1915 [003] 77915.780959: write_opened:
[FAILED TO PARSE] xid=3286130958 fh=0 offset=154624 len=1
nfsd-1915 [003] 77915.780960: write_io_done:
[FAILED TO PARSE] xid=3286130958 fh=0 offset=154624 len=1
nfsd-1915 [003] 77915.780964: write_done:
[FAILED TO PARSE] xid=3286130958 fh=0 offset=154624 len=1
Byte swapping and knfsd_fh_hash() are not available in "trace-cmd
report", where the print format string is actually used. These
data transformations have to be done during the TP_fast_assign step.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/trace.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 8b2f1d92c579..3aa3f3b1eeaa 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -18,19 +18,24 @@ DECLARE_EVENT_CLASS(nfsd_io_class, int len), TP_ARGS(rqstp, fhp, offset, len), TP_STRUCT__entry( - __field(__be32, xid) - __field_struct(struct knfsd_fh, fh) + __field(u32, xid) + __field(u32, fh_hash) __field(loff_t, offset) __field(int, len) ), TP_fast_assign( - __entry->xid = rqstp->rq_xid, - fh_copy_shallow(&__entry->fh, &fhp->fh_handle); + __entry->xid = be32_to_cpu(rqstp->rq_xid); + do { + struct knfsd_fh fh; + + fh_copy_shallow(&fh, &fhp->fh_handle); + __entry->fh_hash = knfsd_fh_hash(&fh); + } while (0); __entry->offset = offset; __entry->len = len; ), - TP_printk("xid=0x%x fh=0x%x offset=%lld len=%d", - __be32_to_cpu(__entry->xid), knfsd_fh_hash(&__entry->fh), + TP_printk("xid=0x%08x fh_hash=0x%08x offset=%lld len=%d", + __entry->xid, __entry->fh_hash, __entry->offset, __entry->len) ) |