Commit 6a4d333d authored by Chuck Lever's avatar Chuck Lever
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
parent 3f965021

fs/nfsd/trace.h

+7 −7
Original line number Diff line number Diff line
@@ -306,14 +306,14 @@ TRACE_EVENT(nfsd_export_update, 
DECLARE_EVENT_CLASS(nfsd_io_class,

	TP_PROTO(struct svc_rqst *rqstp,

		 struct svc_fh	*fhp,

		 loff_t		offset,

		 unsigned long	len),

		 u64		offset,

		 u32		len),

	TP_ARGS(rqstp, fhp, offset, len),

	TP_STRUCT__entry(

		__field(u32, xid)

		__field(u32, fh_hash)

		__field(loff_t, offset)

		__field(unsigned long, len)

		__field(u64, offset)

		__field(u32, len)

	),

	TP_fast_assign(

		__entry->xid = be32_to_cpu(rqstp->rq_xid);
@@ -321,7 +321,7 @@ DECLARE_EVENT_CLASS(nfsd_io_class, 
		__entry->offset = offset;

		__entry->len = len;

	),

	TP_printk("xid=0x%08x fh_hash=0x%08x offset=%lld len=%lu",

	TP_printk("xid=0x%08x fh_hash=0x%08x offset=%llu len=%u",

		  __entry->xid, __entry->fh_hash,

		  __entry->offset, __entry->len)

)
@@ -330,8 +330,8 @@ DECLARE_EVENT_CLASS(nfsd_io_class, 
DEFINE_EVENT(nfsd_io_class, nfsd_##name,	\

	TP_PROTO(struct svc_rqst *rqstp,	\

		 struct svc_fh	*fhp,		\

		 loff_t		offset,		\

		 unsigned long	len),		\

		 u64		offset,		\

		 u32		len),		\

	TP_ARGS(rqstp, fhp, offset, len))



DEFINE_NFSD_IO_EVENT(read_start);