Commit 53acd350 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux 

Pull file locking fix from Jeff Layton:
 "Just a single patch to fix up some tracepoint output"

* tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: Remove extra "0x" in tracepoint format specifier
parents 22230cd2 1ad5f100

include/trace/events/filelock.h

+4 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(filelock_lock, 
		__entry->ret = ret;

	),



	TP_printk("fl=0x%p dev=0x%x:0x%x ino=0x%lx fl_blocker=0x%p fl_owner=0x%p fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d",

	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d",

		__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->fl_blocker, __entry->fl_owner,

		__entry->fl_pid, show_fl_flags(__entry->fl_flags),
@@ -145,7 +145,7 @@ DECLARE_EVENT_CLASS(filelock_lease, 
		__entry->fl_downgrade_time = fl ? fl->fl_downgrade_time : 0;

	),



	TP_printk("fl=0x%p dev=0x%x:0x%x ino=0x%lx fl_blocker=0x%p fl_owner=0x%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu",

	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu",

		__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->fl_blocker, __entry->fl_owner,

		show_fl_flags(__entry->fl_flags),
@@ -195,7 +195,7 @@ TRACE_EVENT(generic_add_lease, 
		__entry->fl_type = fl->fl_type;

	),



	TP_printk("dev=0x%x:0x%x ino=0x%lx wcount=%d rcount=%d icount=%d fl_owner=0x%p fl_flags=%s fl_type=%s",

	TP_printk("dev=0x%x:0x%x ino=0x%lx wcount=%d rcount=%d icount=%d fl_owner=%p fl_flags=%s fl_type=%s",

		MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->wcount, __entry->rcount,

		__entry->icount, __entry->fl_owner,
@@ -228,7 +228,7 @@ TRACE_EVENT(leases_conflict, 
		__entry->conflict = conflict;

	),



	TP_printk("conflict %d: lease=0x%p fl_flags=%s fl_type=%s; breaker=0x%p fl_flags=%s fl_type=%s",

	TP_printk("conflict %d: lease=%p fl_flags=%s fl_type=%s; breaker=%p fl_flags=%s fl_type=%s",

		__entry->conflict,

		__entry->lease,

		show_fl_flags(__entry->l_fl_flags),

CRA Git | Maintained and supported by SUSTech CRA and CCSE