summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4trace.h
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-12-26 18:03:07 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-12-28 09:57:14 -0500
commitf4848303ce125999886535323a64db26dba68293 (patch)
tree6b2981ae3c98b926260756e8556518112f3809b9 /fs/nfs/nfs4trace.h
parentf2dd436edb2b38b555f3ff7257308bb56fa4eea5 (diff)
downloadlinux-f4848303ce125999886535323a64db26dba68293.tar.bz2
pNFS: Modify pnfs_update_layout tracepoints to use layout stateid
Instead of displaying a layout segment pointer in these tracepoints, let's use the layout stateid, now that Olga gave us a set of tools for displaying them. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4trace.h')
-rw-r--r--fs/nfs/nfs4trace.h23
1 files changed, 17 insertions, 6 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 238925c1aafd..d08d0c84b778 100644
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -1461,10 +1461,10 @@ TRACE_EVENT(pnfs_update_layout,
loff_t pos,
u64 count,
enum pnfs_iomode iomode,
- struct pnfs_layout_segment *lseg,
+ struct pnfs_layout_hdr *lo,
enum pnfs_update_layout_reason reason
),
- TP_ARGS(inode, pos, count, iomode, lseg, reason),
+ TP_ARGS(inode, pos, count, iomode, lo, reason),
TP_STRUCT__entry(
__field(dev_t, dev)
__field(u64, fileid)
@@ -1472,7 +1472,8 @@ TRACE_EVENT(pnfs_update_layout,
__field(loff_t, pos)
__field(u64, count)
__field(enum pnfs_iomode, iomode)
- __field(struct pnfs_layout_segment *, lseg)
+ __field(int, layoutstateid_seq)
+ __field(u32, layoutstateid_hash)
__field(enum pnfs_update_layout_reason, reason)
),
TP_fast_assign(
@@ -1482,18 +1483,28 @@ TRACE_EVENT(pnfs_update_layout,
__entry->pos = pos;
__entry->count = count;
__entry->iomode = iomode;
- __entry->lseg = lseg;
__entry->reason = reason;
+ if (lo != NULL) {
+ __entry->layoutstateid_seq =
+ be32_to_cpu(lo->plh_stateid.seqid);
+ __entry->layoutstateid_hash =
+ nfs_stateid_hash(&lo->plh_stateid);
+ } else {
+ __entry->layoutstateid_seq = 0;
+ __entry->layoutstateid_hash = 0;
+ }
),
TP_printk(
"fileid=%02x:%02x:%llu fhandle=0x%08x "
- "iomode=%s pos=%llu count=%llu lseg=%p (%s)",
+ "iomode=%s pos=%llu count=%llu "
+ "layoutstateid=%d:0x%08x (%s)",
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
show_pnfs_iomode(__entry->iomode),
(unsigned long long)__entry->pos,
- (unsigned long long)__entry->count, __entry->lseg,
+ (unsigned long long)__entry->count,
+ __entry->layoutstateid_seq, __entry->layoutstateid_hash,
show_pnfs_update_layout_reason(__entry->reason)
)
);