]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFSD: Remove extra "0x" in tracepoint format specifier
authorChuck Lever <chuck.lever@oracle.com>
Fri, 4 Sep 2020 19:06:26 +0000 (15:06 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jun 2024 12:52:33 +0000 (14:52 +0200)
[ Upstream commit 3a90e1dff16afdae6e1c918bfaff24f4d0f84869 ]

Clean up: %p adds its own 0x already.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfsd/trace.h

index 7bb1c398daa51134774769f8435c5b7f381aeed4..9239d97b682c7a2ebe6708614494438bd57f91a8 100644 (file)
@@ -444,7 +444,7 @@ DECLARE_EVENT_CLASS(nfsd_file_class,
                __entry->nf_may = nf->nf_may;
                __entry->nf_file = nf->nf_file;
        ),
-       TP_printk("hash=0x%x inode=0x%p ref=%d flags=%s may=%s file=%p",
+       TP_printk("hash=0x%x inode=%p ref=%d flags=%s may=%s file=%p",
                __entry->nf_hashval,
                __entry->nf_inode,
                __entry->nf_ref,
@@ -495,7 +495,7 @@ TRACE_EVENT(nfsd_file_acquire,
                __entry->status = be32_to_cpu(status);
        ),
 
-       TP_printk("xid=0x%x hash=0x%x inode=0x%p may_flags=%s ref=%d nf_flags=%s nf_may=%s nf_file=0x%p status=%u",
+       TP_printk("xid=0x%x hash=0x%x inode=%p may_flags=%s ref=%d nf_flags=%s nf_may=%s nf_file=%p status=%u",
                        __entry->xid, __entry->hash, __entry->inode,
                        show_nfsd_may_flags(__entry->may_flags),
                        __entry->nf_ref, show_nf_flags(__entry->nf_flags),
@@ -516,7 +516,7 @@ DECLARE_EVENT_CLASS(nfsd_file_search_class,
                __entry->hash = hash;
                __entry->found = found;
        ),
-       TP_printk("hash=0x%x inode=0x%p found=%d", __entry->hash,
+       TP_printk("hash=0x%x inode=%p found=%d", __entry->hash,
                        __entry->inode, __entry->found)
 );
 
@@ -544,7 +544,7 @@ TRACE_EVENT(nfsd_file_fsnotify_handle_event,
                __entry->mode = inode->i_mode;
                __entry->mask = mask;
        ),
-       TP_printk("inode=0x%p nlink=%u mode=0%ho mask=0x%x", __entry->inode,
+       TP_printk("inode=%p nlink=%u mode=0%ho mask=0x%x", __entry->inode,
                        __entry->nlink, __entry->mode, __entry->mask)
 );