]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
filelock: rename fl_pid variable in lock_get_status
authorJeff Layton <jlayton@kernel.org>
Wed, 31 Jan 2024 23:01:44 +0000 (18:01 -0500)
committerChristian Brauner <brauner@kernel.org>
Fri, 2 Feb 2024 11:09:05 +0000 (12:09 +0100)
In later patches we're going to introduce some macros that will clash
with the variable name here. Rename it.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-3-c6129007ee8d@kernel.org
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/locks.c

index cc7c117ee19294410b02333638ba5f810b0cdadd..1eceaa56e47f98b58b5e0ad75a06967c2cfc7a25 100644 (file)
@@ -2695,11 +2695,11 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
                            loff_t id, char *pfx, int repeat)
 {
        struct inode *inode = NULL;
-       unsigned int fl_pid;
+       unsigned int pid;
        struct pid_namespace *proc_pidns = proc_pid_ns(file_inode(f->file)->i_sb);
        int type;
 
-       fl_pid = locks_translate_pid(fl, proc_pidns);
+       pid = locks_translate_pid(fl, proc_pidns);
        /*
         * If lock owner is dead (and pid is freed) or not visible in current
         * pidns, zero is shown as a pid value. Check lock info from
@@ -2747,11 +2747,11 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
                             (type == F_RDLCK) ? "READ" : "UNLCK");
        if (inode) {
                /* userspace relies on this representation of dev_t */
-               seq_printf(f, "%d %02x:%02x:%lu ", fl_pid,
+               seq_printf(f, "%d %02x:%02x:%lu ", pid,
                                MAJOR(inode->i_sb->s_dev),
                                MINOR(inode->i_sb->s_dev), inode->i_ino);
        } else {
-               seq_printf(f, "%d <none>:0 ", fl_pid);
+               seq_printf(f, "%d <none>:0 ", pid);
        }
        if (IS_POSIX(fl)) {
                if (fl->fl_end == OFFSET_MAX)