kevin/linux
1
Fork 0
Code

filelock: have fs/locks.c deal with file_lock_core directly

Browse Source 
Convert fs/locks.c to access fl_core fields direcly rather than using
the backward-compatibility macros. Most of this was done with
coccinelle, with a few by-hand fixups.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-18-c6129007ee8d@kernel.org
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jeff Layton 2024-01-31 18:01:59 -05:00 committed by Christian Brauner
parent a69ce85ec9
commit 4ca52f5398
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 254 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
fs/locks.c
View File

File diff suppressed because it is too large Load Diff

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

@ -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->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->blocker = fl ? fl->c.flc_blocker : NULL;
__entry->owner = fl ? fl->c.flc_owner : NULL;
__entry->pid = fl ? fl->c.flc_pid : 0;
__entry->flags = fl ? fl->c.flc_flags : 0;
__entry->type = fl ? fl->c.flc_type : 0;
__entry->fl_start = fl ? fl->fl_start : 0;
__entry->fl_end = fl ? fl->fl_end : 0;
__entry->ret = ret;
@ -137,10 +137,10 @@ DECLARE_EVENT_CLASS(filelock_lease,
__entry->fl = fl ? fl : NULL;
__entry->s_dev = inode->i_sb->s_dev;
__entry->i_ino = inode->i_ino;
__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->blocker = fl ? fl->c.flc_blocker : NULL;
__entry->owner = fl ? fl->c.flc_owner : NULL;
__entry->flags = fl ? fl->c.flc_flags : 0;
__entry->type = fl ? fl->c.flc_type : 0;
__entry->break_time = fl ? fl->fl_break_time : 0;
__entry->downgrade_time = fl ? fl->fl_downgrade_time : 0;
),
@ -190,9 +190,9 @@ 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->owner = fl->fl_owner;
__entry->flags = fl->fl_flags;
__entry->type = fl->fl_type;
__entry->owner = fl->c.flc_owner;
__entry->flags = fl->c.flc_flags;
__entry->type = fl->c.flc_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",
@ -220,11 +220,11 @@ TRACE_EVENT(leases_conflict,
TP_fast_assign(
__entry->lease = lease;
__entry->l_fl_flags = lease->fl_flags;
__entry->l_fl_type = lease->fl_type;
__entry->l_fl_flags = lease->c.flc_flags;
__entry->l_fl_type = lease->c.flc_type;
__entry->breaker = breaker;
__entry->b_fl_flags = breaker->fl_flags;
__entry->b_fl_type = breaker->fl_type;
__entry->b_fl_flags = breaker->c.flc_flags;
__entry->b_fl_type = breaker->c.flc_type;
__entry->conflict = conflict;
),