Unverified Commit 587a67b6 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

filelock: rename some fields in tracepoints 



In later patches we're going to introduce some macros with names that
clash with fields here. To prevent problems building, just rename the
fields in the trace entry structures.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-2-c6129007ee8d@kernel.org


Reviewed-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 0e9876d8

include/trace/events/filelock.h

+38 −38
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ DECLARE_EVENT_CLASS(filelock_lock, 
		__field(struct file_lock *, fl)

		__field(unsigned long, i_ino)

		__field(dev_t, s_dev)

		__field(struct file_lock *, fl_blocker)

		__field(fl_owner_t, fl_owner)

		__field(unsigned int, fl_pid)

		__field(unsigned int, fl_flags)

		__field(unsigned char, fl_type)

		__field(struct file_lock *, blocker)

		__field(fl_owner_t, owner)

		__field(unsigned int, pid)

		__field(unsigned int, flags)

		__field(unsigned char, type)

		__field(loff_t, fl_start)

		__field(loff_t, fl_end)

		__field(int, ret)
@@ -82,11 +82,11 @@ DECLARE_EVENT_CLASS(filelock_lock, 
		__entry->fl = fl ? fl : NULL;

		__entry->s_dev = inode->i_sb->s_dev;

		__entry->i_ino = inode->i_ino;

		__entry->fl_blocker = fl ? fl->fl_blocker : NULL;

		__entry->fl_owner = fl ? fl->fl_owner : NULL;

		__entry->fl_pid = fl ? fl->fl_pid : 0;

		__entry->fl_flags = fl ? fl->fl_flags : 0;

		__entry->fl_type = fl ? fl->fl_type : 0;

		__entry->blocker = fl ? fl->fl_blocker : NULL;

		__entry->owner = fl ? fl->fl_owner : NULL;

		__entry->pid = fl ? fl->fl_pid : 0;

		__entry->flags = fl ? fl->fl_flags : 0;

		__entry->type = fl ? fl->fl_type : 0;

		__entry->fl_start = fl ? fl->fl_start : 0;

		__entry->fl_end = fl ? fl->fl_end : 0;

		__entry->ret = ret;
@@ -94,9 +94,9 @@ DECLARE_EVENT_CLASS(filelock_lock, 


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

		show_fl_type(__entry->fl_type),

		__entry->i_ino, __entry->blocker, __entry->owner,

		__entry->pid, show_fl_flags(__entry->flags),

		show_fl_type(__entry->type),

		__entry->fl_start, __entry->fl_end, __entry->ret)

);
@@ -125,32 +125,32 @@ DECLARE_EVENT_CLASS(filelock_lease, 
		__field(struct file_lock *, fl)

		__field(unsigned long, i_ino)

		__field(dev_t, s_dev)

		__field(struct file_lock *, fl_blocker)

		__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)

		__field(struct file_lock *, blocker)

		__field(fl_owner_t, owner)

		__field(unsigned int, flags)

		__field(unsigned char, type)

		__field(unsigned long, break_time)

		__field(unsigned long, 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_blocker = fl ? fl->fl_blocker : 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;

		__entry->blocker = fl ? fl->fl_blocker : NULL;

		__entry->owner = fl ? fl->fl_owner : NULL;

		__entry->flags = fl ? fl->fl_flags : 0;

		__entry->type = fl ? fl->fl_type : 0;

		__entry->break_time = fl ? fl->fl_break_time : 0;

		__entry->downgrade_time = fl ? fl->fl_downgrade_time : 0;

	),



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

		show_fl_type(__entry->fl_type),

		__entry->fl_break_time, __entry->fl_downgrade_time)

		__entry->i_ino, __entry->blocker, __entry->owner,

		show_fl_flags(__entry->flags),

		show_fl_type(__entry->type),

		__entry->break_time, __entry->downgrade_time)

);



DEFINE_EVENT(filelock_lease, break_lease_noblock, TP_PROTO(struct inode *inode, struct file_lock *fl),
@@ -179,9 +179,9 @@ TRACE_EVENT(generic_add_lease, 
		__field(int, rcount)

		__field(int, icount)

		__field(dev_t, s_dev)

		__field(fl_owner_t, fl_owner)

		__field(unsigned int, fl_flags)

		__field(unsigned char, fl_type)

		__field(fl_owner_t, owner)

		__field(unsigned int, flags)

		__field(unsigned char, type)

	),



	TP_fast_assign(
@@ -190,17 +190,17 @@ TRACE_EVENT(generic_add_lease, 
		__entry->wcount = atomic_read(&inode->i_writecount);

		__entry->rcount = atomic_read(&inode->i_readcount);

		__entry->icount = atomic_read(&inode->i_count);

		__entry->fl_owner = fl->fl_owner;

		__entry->fl_flags = fl->fl_flags;

		__entry->fl_type = fl->fl_type;

		__entry->owner = fl->fl_owner;

		__entry->flags = fl->fl_flags;

		__entry->type = fl->fl_type;

	),



	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,

		show_fl_flags(__entry->fl_flags),

		show_fl_type(__entry->fl_type))

		__entry->icount, __entry->owner,

		show_fl_flags(__entry->flags),

		show_fl_type(__entry->type))

);



TRACE_EVENT(leases_conflict,