Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7d345c8 authored by Chuck Lever's avatar Chuck Lever Committed by Greg Kroah-Hartman
Browse files

NFSD: Fix offset type in I/O trace points 



commit 6a4d333d540041d244b2fca29b8417bfde20af81 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34217d77

fs/nfsd/trace.h

+7 −7
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ TRACE_EVENT(nfsd_compound_status, 
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);
@@ -68,7 +68,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)

)
@@ -77,8 +77,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);