From 7739a0084ef2d2541e46dfc2b47ce8d677b16e98 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Wed, 20 Sep 2017 16:43:44 -0500 Subject: [PATCH] scoutfs: replace trace_printk in xattr.c Signed-off-by: Mark Fasheh --- kmod/src/scoutfs_trace.h | 27 +++++++++++++++++++++++++++ kmod/src/xattr.c | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/kmod/src/scoutfs_trace.h b/kmod/src/scoutfs_trace.h index 7bf5aaea..07ef28af 100644 --- a/kmod/src/scoutfs_trace.h +++ b/kmod/src/scoutfs_trace.h @@ -36,6 +36,33 @@ #define FSID_ARG(sb) le64_to_cpu(SCOUTFS_SB(sb)->super.hdr.fsid) #define FSID_FMT "%llx" +TRACE_EVENT(scoutfs_xattr_set, + TP_PROTO(struct super_block *sb, size_t name_len, const void *value, + size_t size, int flags), + + TP_ARGS(sb, name_len, value, size, flags), + + TP_STRUCT__entry( + __field(__u64, fsid) + __field(size_t, name_len) + __field(const void *, value) + __field(size_t, size) + __field(int, flags) + ), + + TP_fast_assign( + __entry->fsid = FSID_ARG(sb); + __entry->name_len = name_len; + __entry->value = value; + __entry->size = size; + __entry->flags = flags; + ), + + TP_printk(FSID_FMT" name_len %zu value %p size %zu flags 0x%x", + __entry->fsid, __entry->name_len, __entry->value, + __entry->size, __entry->flags) +); + TRACE_EVENT(scoutfs_manifest_next_compact, TP_PROTO(struct super_block *sb, int level), diff --git a/kmod/src/xattr.c b/kmod/src/xattr.c index 3f81ed6e..5c775b80 100644 --- a/kmod/src/xattr.c +++ b/kmod/src/xattr.c @@ -24,6 +24,7 @@ #include "trans.h" #include "xattr.h" #include "lock.h" +#include "scoutfs_trace.h" /* * In the simple case an xattr is stored in a single item whose key and @@ -271,8 +272,7 @@ static int scoutfs_xattr_set(struct dentry *dentry, const char *name, int sif; int ret; - trace_printk("name_len %zu value %p size %zu flags 0x%x\n", - name_len, value, size, flags); + trace_scoutfs_xattr_set(sb, name_len, value, size, flags); if (name_len > SCOUTFS_XATTR_MAX_NAME_LEN || (value && size > SCOUTFS_XATTR_MAX_SIZE))