Skip to content

Commit 6a4d333

Browse files
committed
NFSD: Fix offset type in I/O trace points
NFSv3 and NFSv4 use u64 offset values on the wire. Record these values verbatim without the implicit type case to loff_t. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 3f96502 commit 6a4d333

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

fs/nfsd/trace.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,22 +306,22 @@ TRACE_EVENT(nfsd_export_update,
306306
DECLARE_EVENT_CLASS(nfsd_io_class,
307307
TP_PROTO(struct svc_rqst *rqstp,
308308
struct svc_fh *fhp,
309-
loff_t offset,
310-
unsigned long len),
309+
u64 offset,
310+
u32 len),
311311
TP_ARGS(rqstp, fhp, offset, len),
312312
TP_STRUCT__entry(
313313
__field(u32, xid)
314314
__field(u32, fh_hash)
315-
__field(loff_t, offset)
316-
__field(unsigned long, len)
315+
__field(u64, offset)
316+
__field(u32, len)
317317
),
318318
TP_fast_assign(
319319
__entry->xid = be32_to_cpu(rqstp->rq_xid);
320320
__entry->fh_hash = knfsd_fh_hash(&fhp->fh_handle);
321321
__entry->offset = offset;
322322
__entry->len = len;
323323
),
324-
TP_printk("xid=0x%08x fh_hash=0x%08x offset=%lld len=%lu",
324+
TP_printk("xid=0x%08x fh_hash=0x%08x offset=%llu len=%u",
325325
__entry->xid, __entry->fh_hash,
326326
__entry->offset, __entry->len)
327327
)
@@ -330,8 +330,8 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
330330
DEFINE_EVENT(nfsd_io_class, nfsd_##name, \
331331
TP_PROTO(struct svc_rqst *rqstp, \
332332
struct svc_fh *fhp, \
333-
loff_t offset, \
334-
unsigned long len), \
333+
u64 offset, \
334+
u32 len), \
335335
TP_ARGS(rqstp, fhp, offset, len))
336336

337337
DEFINE_NFSD_IO_EVENT(read_start);

0 commit comments

Comments
 (0)