From cf3f9fee7582f352e56321a7311fb592cf5e3de4 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Wed, 20 Sep 2017 18:03:56 -0500 Subject: [PATCH] scoutfs: replace trace_printk in lock.c Also clean up these traces a bit and make a lock_info trace class which we can expand in a future patch. Signed-off-by: Mark Fasheh --- kmod/src/lock.c | 6 ++---- kmod/src/scoutfs_trace.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/kmod/src/lock.c b/kmod/src/lock.c index d2023596..12e4669d 100644 --- a/kmod/src/lock.c +++ b/kmod/src/lock.c @@ -715,8 +715,7 @@ static int init_lock_info(struct super_block *sb) sbi->lock_info = linfo; - trace_printk("sb %p id %016llx allocated linfo %p held %p\n", - sb, le64_to_cpu(sbi->super.id), linfo, linfo); + trace_init_lock_info(sb, linfo); out: if (ret) kfree(linfo); @@ -744,8 +743,7 @@ void scoutfs_lock_destroy(struct super_block *sb) sbi->lock_info = NULL; - trace_printk("sb %p id %016llx freeing linfo %p linfo %p\n", - sb, le64_to_cpu(sbi->super.id), linfo, linfo); + trace_scoutfs_lock_destroy(sb, linfo); kfree(linfo); } diff --git a/kmod/src/scoutfs_trace.h b/kmod/src/scoutfs_trace.h index 07ef28af..fce7f9bb 100644 --- a/kmod/src/scoutfs_trace.h +++ b/kmod/src/scoutfs_trace.h @@ -33,9 +33,39 @@ #include "seg.h" #include "super.h" +struct lock_info; + #define FSID_ARG(sb) le64_to_cpu(SCOUTFS_SB(sb)->super.hdr.fsid) #define FSID_FMT "%llx" +DECLARE_EVENT_CLASS(scoutfs_lock_info_class, + TP_PROTO(struct super_block *sb, struct lock_info *linfo), + + TP_ARGS(sb, linfo), + + TP_STRUCT__entry( + __field(__u64, fsid) + __field(struct lock_info *, linfo) + ), + + TP_fast_assign( + __entry->fsid = FSID_ARG(sb); + __entry->linfo = linfo; + ), + + TP_printk(FSID_FMT" linfo %p", __entry->fsid, __entry->linfo) +); + +DEFINE_EVENT(scoutfs_lock_info_class, init_lock_info, + TP_PROTO(struct super_block *sb, struct lock_info *linfo), + TP_ARGS(sb, linfo) +); + +DEFINE_EVENT(scoutfs_lock_info_class, scoutfs_lock_destroy, + TP_PROTO(struct super_block *sb, struct lock_info *linfo), + TP_ARGS(sb, linfo) +); + TRACE_EVENT(scoutfs_xattr_set, TP_PROTO(struct super_block *sb, size_t name_len, const void *value, size_t size, int flags),