]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
n_tty: Rename tail to old_tail in n_tty_read()
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 11 Nov 2022 14:25:02 +0000 (16:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Aug 2023 08:22:29 +0000 (10:22 +0200)
[ Upstream commit 947d66b68f3c4e7cf8f3f3500807b9d2a0de28ce ]

The local tail variable in n_tty_read() is used for one purpose, it
keeps the old tail. Thus, rename it appropriately to improve code
readability.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/22b37499-ff9a-7fc1-f6e0-58411328d122@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 4903fde8047a ("tty: fix hang on tty device with no_room set")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/n_tty.c

index 891036bd9f897af7c6efa95be43f25daa35db9ea..8f57448e1ce46b262e001432a77a486ed4f205d3 100644 (file)
@@ -2100,7 +2100,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
        ssize_t retval = 0;
        long timeout;
        bool packet;
-       size_t tail;
+       size_t old_tail;
 
        /*
         * Is this a continuation of a read started earler?
@@ -2163,7 +2163,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
        }
 
        packet = tty->ctrl.packet;
-       tail = ldata->read_tail;
+       old_tail = ldata->read_tail;
 
        add_wait_queue(&tty->read_wait, &wait);
        while (nr) {
@@ -2252,7 +2252,7 @@ more_to_be_read:
                if (time)
                        timeout = time;
        }
-       if (tail != ldata->read_tail)
+       if (old_tail != ldata->read_tail)
                n_tty_kick_worker(tty);
        up_read(&tty->termios_rwsem);