![Jeff Layton](/assets/img/avatar_default.png)
Ensure that it's OK to pass in a NULL file_lock double pointer on a F_UNLCK request and convert the vfs_setlease F_UNLCK callers to do just that. Finally, turn the BUG_ON in generic_setlease into a WARN_ON_ONCE with an error return. That's a problem we can handle without crashing the box if it occurs. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
97 lines
3 KiB
C
97 lines
3 KiB
C
/*
|
|
* Events for filesystem locks
|
|
*
|
|
* Copyright 2013 Jeff Layton <jlayton@poochiereds.net>
|
|
*/
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM filelock
|
|
|
|
#if !defined(_TRACE_FILELOCK_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_FILELOCK_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/device.h>
|
|
#include <linux/kdev_t.h>
|
|
|
|
#define show_fl_flags(val) \
|
|
__print_flags(val, "|", \
|
|
{ FL_POSIX, "FL_POSIX" }, \
|
|
{ FL_FLOCK, "FL_FLOCK" }, \
|
|
{ FL_DELEG, "FL_DELEG" }, \
|
|
{ FL_ACCESS, "FL_ACCESS" }, \
|
|
{ FL_EXISTS, "FL_EXISTS" }, \
|
|
{ FL_LEASE, "FL_LEASE" }, \
|
|
{ FL_CLOSE, "FL_CLOSE" }, \
|
|
{ FL_SLEEP, "FL_SLEEP" }, \
|
|
{ FL_DOWNGRADE_PENDING, "FL_DOWNGRADE_PENDING" }, \
|
|
{ FL_UNLOCK_PENDING, "FL_UNLOCK_PENDING" }, \
|
|
{ FL_OFDLCK, "FL_OFDLCK" })
|
|
|
|
#define show_fl_type(val) \
|
|
__print_symbolic(val, \
|
|
{ F_RDLCK, "F_RDLCK" }, \
|
|
{ F_WRLCK, "F_WRLCK" }, \
|
|
{ F_UNLCK, "F_UNLCK" })
|
|
|
|
DECLARE_EVENT_CLASS(filelock_lease,
|
|
|
|
TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
|
|
TP_ARGS(inode, fl),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(struct file_lock *, fl)
|
|
__field(unsigned long, i_ino)
|
|
__field(dev_t, s_dev)
|
|
__field(struct file_lock *, fl_next)
|
|
__field(fl_owner_t, fl_owner)
|
|
__field(unsigned int, fl_flags)
|
|
__field(unsigned char, fl_type)
|
|
__field(unsigned long, fl_break_time)
|
|
__field(unsigned long, fl_downgrade_time)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->fl = fl ? fl : NULL;
|
|
__entry->s_dev = inode->i_sb->s_dev;
|
|
__entry->i_ino = inode->i_ino;
|
|
__entry->fl_next = fl ? fl->fl_next : NULL;
|
|
__entry->fl_owner = fl ? fl->fl_owner : NULL;
|
|
__entry->fl_flags = fl ? fl->fl_flags : 0;
|
|
__entry->fl_type = fl ? fl->fl_type : 0;
|
|
__entry->fl_break_time = fl ? fl->fl_break_time : 0;
|
|
__entry->fl_downgrade_time = fl ? fl->fl_downgrade_time : 0;
|
|
),
|
|
|
|
TP_printk("fl=0x%p dev=0x%x:0x%x ino=0x%lx fl_next=0x%p fl_owner=0x%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_next, __entry->fl_owner,
|
|
show_fl_flags(__entry->fl_flags),
|
|
show_fl_type(__entry->fl_type),
|
|
__entry->fl_break_time, __entry->fl_downgrade_time)
|
|
);
|
|
|
|
DEFINE_EVENT(filelock_lease, break_lease_noblock, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
DEFINE_EVENT(filelock_lease, break_lease_block, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
DEFINE_EVENT(filelock_lease, break_lease_unblock, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
DEFINE_EVENT(filelock_lease, generic_add_lease, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
DEFINE_EVENT(filelock_lease, generic_delete_lease, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
DEFINE_EVENT(filelock_lease, time_out_leases, TP_PROTO(struct inode *inode, struct file_lock *fl),
|
|
TP_ARGS(inode, fl));
|
|
|
|
#endif /* _TRACE_FILELOCK_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|