xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: Fix offset type in I/O trace points

Browse Source 
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chuck Lever
2022-02-04 17:05:24 -05:00
committed by Greg Kroah-Hartman
parent 3a6a2d43e3
commit 6215fb4558
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/trace.h
View File

@@ -175,14 +175,14 @@ TRACE_EVENT(nfsd_export_update,
DECLARE_EVENT_CLASS(nfsd_io_class, DECLARE_EVENT_CLASS(nfsd_io_class,
TP_PROTO(struct svc_rqst *rqstp, TP_PROTO(struct svc_rqst *rqstp,
struct svc_fh *fhp, struct svc_fh *fhp,
loff_t offset, u64 offset,
unsigned long len), u32 len),
TP_ARGS(rqstp, fhp, offset, len), TP_ARGS(rqstp, fhp, offset, len),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(u32, xid) __field(u32, xid)
__field(u32, fh_hash) __field(u32, fh_hash)
__field(loff_t, offset) __field(u64, offset)
__field(unsigned long, len) __field(u32, len)
), ),
TP_fast_assign( TP_fast_assign(
__entry->xid = be32_to_cpu(rqstp->rq_xid); __entry->xid = be32_to_cpu(rqstp->rq_xid);
@@ -190,7 +190,7 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
__entry->offset = offset; __entry->offset = offset;
__entry->len = len; __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->xid, __entry->fh_hash,
__entry->offset, __entry->len) __entry->offset, __entry->len)
) )
@@ -199,8 +199,8 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
DEFINE_EVENT(nfsd_io_class, nfsd_##name, \ DEFINE_EVENT(nfsd_io_class, nfsd_##name, \
TP_PROTO(struct svc_rqst *rqstp, \ TP_PROTO(struct svc_rqst *rqstp, \
struct svc_fh *fhp, \ struct svc_fh *fhp, \
loff_t offset, \ u64 offset, \
unsigned long len), \ u32 len), \
TP_ARGS(rqstp, fhp, offset, len)) TP_ARGS(rqstp, fhp, offset, len))
DEFINE_NFSD_IO_EVENT(read_start); DEFINE_NFSD_IO_EVENT(read_start);