diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 21:56:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 21:56:50 -0700 |
| commit | 575b94386bd539a7d803aee9fd4a8d275844c40f (patch) | |
| tree | ef5390206b64cf724a1485cfa3566ae20e4b73d2 /include/trace | |
| parent | 4591343e3560d51fa37a24cd262192a7b889a6a3 (diff) | |
| parent | da33a871ba178dbe81da7d755818d3c2088cae32 (diff) | |
| download | linux-575b94386bd539a7d803aee9fd4a8d275844c40f.tar.gz linux-575b94386bd539a7d803aee9fd4a8d275844c40f.tar.bz2 linux-575b94386bd539a7d803aee9fd4a8d275844c40f.zip | |
Merge tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"Just a couple of patches from Konstantin to fix /proc/locks when the
process that set the lock has exited, and a new tracepoint for the
flock() codepath. Also threw in mailmap entries for my addresses and a
comment cleanup"
* tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: remove misleading obsolete comment
mailmap: remap some of my email addresses to kernel.org address
locks: add tracepoint in flock codepath
fs/lock: show locks taken by processes from another pidns
fs/lock: skip lock owner pid translation in case we are in init_pid_ns
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/filelock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/trace/events/filelock.h b/include/trace/events/filelock.h index d1faf3597b9d..68b17c116907 100644 --- a/include/trace/events/filelock.h +++ b/include/trace/events/filelock.h @@ -112,8 +112,11 @@ DEFINE_EVENT(filelock_lock, locks_remove_posix, TP_PROTO(struct inode *inode, struct file_lock *fl, int ret), TP_ARGS(inode, fl, ret)); -DECLARE_EVENT_CLASS(filelock_lease, +DEFINE_EVENT(filelock_lock, flock_lock_inode, + TP_PROTO(struct inode *inode, struct file_lock *fl, int ret), + TP_ARGS(inode, fl, ret)); +DECLARE_EVENT_CLASS(filelock_lease, TP_PROTO(struct inode *inode, struct file_lock *fl), TP_ARGS(inode, fl), |