Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 11:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

File locking fix for v5.10

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEES8DXskRxsqGE6vXTAA5oQRlWghUFAl+EOfITHGpsYXl0b25A
 a2VybmVsLm9yZwAKCRAADmhBGVaCFY1pEACkyAuCmEZHMF+8+HjqFQSwDIoNLmbs
 eAjn6TSvurBRNOOVkFSrcWgf+jKbefepfWOnn708XpKcyZiWD374+eLo3JHeVRPN
 qwv0sKo/0l59qqJ2yu2GvcBiNgrUGzYWin8t/4QZRResWkGLSMwXlWHqA9lUwrRW
 CnA9Scs1ELbuBBmC+Xr8z3twSvZeaXtRJ+/+6lBpsamhUEBJwjqUja5/gTOyWFFW
 sChOasLfPBKnxxZfuKZBAQXrcqCQ8kqr9F7sTeO6awchH8/RtBRwEZilNhR2ZUqO
 iPlQ5mJ38DqOs1yFFiYvcBWvxgQqQlHLfURtPGFaz1uF7JttddnNEfUXAFpI34Zl
 0ZzRh8Acc9zvq02J7IeNjPalv/MG9G/Dh44mvknCjP6E0+Uzs08SrixcaeJcmmKg
 a2pqsuZuLNiQoIRo4t+rqeqWFFb44IGa8gEren7QRVkfnWb09OLYAGNxVLC2X7+w
 2JFncEwFH8VOvsX8hw42SFZAOPMGDhdjeElh16GNNp2ttDnYuWMgCmsK33I3b0jQ
 sjLN17b+263pKdHAm7sh6WHEocKGDsL6U4E/E9vThac6mipRKGeSHU83jtH6I56g
 h5O1SpZBVOCBcE0XfMyu9wwzNC8JFZ9XAQW3iFfDKTzxW0CABpisG+ODS59wB8r0
 7lNa3L8c69PeGA==
 =Qa10
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-10-12 16:50:18 -07:00
commit 53acd35050
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/trace/events/filelock.h
View File

@ -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),