redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

locks: Add trace_leases_conflict 

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
alistair/sunxi64-5.4-dsi
Ira Weiny 2019-06-05 18:45:34 -07:00 committed by Jeff Layton
parent 9e0babf2c0
commit d51f527f44
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/locks.c
View File

@ -1534,11 +1534,21 @@ static void time_out_leases(struct inode *inode, struct list_head *dispose)
static bool leases_conflict(struct file_lock *lease, struct file_lock *breaker)
{
if ((breaker->fl_flags & FL_LAYOUT) != (lease->fl_flags & FL_LAYOUT))
return false;
if ((breaker->fl_flags & FL_DELEG) && (lease->fl_flags & FL_LEASE))
return false;
return locks_conflict(breaker, lease);
bool rc;
if ((breaker->fl_flags & FL_LAYOUT) != (lease->fl_flags & FL_LAYOUT)) {
rc = false;
goto trace;
}
if ((breaker->fl_flags & FL_DELEG) && (lease->fl_flags & FL_LEASE)) {
rc = false;
goto trace;
}
rc = locks_conflict(breaker, lease);
trace:
trace_leases_conflict(rc, lease, breaker);
return rc;
}
static bool

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

@ -203,6 +203,41 @@ TRACE_EVENT(generic_add_lease,
show_fl_type(__entry->fl_type))
);
TRACE_EVENT(leases_conflict,
TP_PROTO(bool conflict, struct file_lock *lease, struct file_lock *breaker),
TP_ARGS(conflict, lease, breaker),
TP_STRUCT__entry(
__field(void *, lease)
__field(void *, breaker)
__field(unsigned int, l_fl_flags)
__field(unsigned int, b_fl_flags)
__field(unsigned char, l_fl_type)
__field(unsigned char, b_fl_type)
__field(bool, conflict)
),
TP_fast_assign(
__entry->lease = lease;
__entry->l_fl_flags = lease->fl_flags;
__entry->l_fl_type = lease->fl_type;
__entry->breaker = breaker;
__entry->b_fl_flags = breaker->fl_flags;
__entry->b_fl_type = breaker->fl_type;
__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",
__entry->conflict,
__entry->lease,
show_fl_flags(__entry->l_fl_flags),
show_fl_type(__entry->l_fl_type),
__entry->breaker,
show_fl_flags(__entry->b_fl_flags),
show_fl_type(__entry->b_fl_type))
);
#endif /* _TRACE_FILELOCK_H */
/* This part must be outside protection */