tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+4
-4
include/trace/events/filelock.h
+4
-4
include/trace/events/filelock.h
···
92
92
__entry->ret = ret;
93
93
),
94
94
95
-
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",
95
+
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",
96
96
__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
97
97
__entry->i_ino, __entry->fl_blocker, __entry->fl_owner,
98
98
__entry->fl_pid, show_fl_flags(__entry->fl_flags),
···
145
145
__entry->fl_downgrade_time = fl ? fl->fl_downgrade_time : 0;
146
146
),
147
147
148
-
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",
148
+
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",
149
149
__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
150
150
__entry->i_ino, __entry->fl_blocker, __entry->fl_owner,
151
151
show_fl_flags(__entry->fl_flags),
···
195
195
__entry->fl_type = fl->fl_type;
196
196
),
197
197
198
-
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",
198
+
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",
199
199
MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
200
200
__entry->i_ino, __entry->wcount, __entry->rcount,
201
201
__entry->icount, __entry->fl_owner,
···
228
228
__entry->conflict = conflict;
229
229
),
230
230
231
-
TP_printk("conflict %d: lease=0x%p fl_flags=%s fl_type=%s; breaker=0x%p fl_flags=%s fl_type=%s",
231
+
TP_printk("conflict %d: lease=%p fl_flags=%s fl_type=%s; breaker=%p fl_flags=%s fl_type=%s",
232
232
__entry->conflict,
233
233
__entry->lease,
234
234
show_fl_flags(__entry->l_fl_flags),