admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

tty: simplify throttling using guard()s

Browse Source 
tty_throttle_safe() and tty_unthrottle_safe can be made less convoluted
using guard()s. Switch them.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250425111315.1036184-2-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE)
2025-04-25 13:13:10 +02:00
committed by Greg Kroah-Hartman
parent e6afad4587
commit 3eabc1a34b
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/tty/tty_ioctl.c
View File

@@ -122,21 +122,19 @@ EXPORT_SYMBOL(tty_unthrottle);
*/ */
bool tty_throttle_safe(struct tty_struct *tty) bool tty_throttle_safe(struct tty_struct *tty)
{ {
bool ret = true; guard(mutex)(&tty->throttle_mutex);
mutex_lock(&tty->throttle_mutex); if (tty_throttled(tty))
if (!tty_throttled(tty)) { return true;
if (tty->flow_change != TTY_THROTTLE_SAFE)
ret = false;
else {
set_bit(TTY_THROTTLED, &tty->flags);
if (tty->ops->throttle)
tty->ops->throttle(tty);
}
}
mutex_unlock(&tty->throttle_mutex);
return ret; if (tty->flow_change != TTY_THROTTLE_SAFE)
return false;
set_bit(TTY_THROTTLED, &tty->flags);
if (tty->ops->throttle)
tty->ops->throttle(tty);
return true;
} }
/** /**
@@ -152,21 +150,19 @@ bool tty_throttle_safe(struct tty_struct *tty)
*/ */
bool tty_unthrottle_safe(struct tty_struct *tty) bool tty_unthrottle_safe(struct tty_struct *tty)
{ {
bool ret = true; guard(mutex)(&tty->throttle_mutex);
mutex_lock(&tty->throttle_mutex); if (!tty_throttled(tty))
if (tty_throttled(tty)) { return true;
if (tty->flow_change != TTY_UNTHROTTLE_SAFE)
ret = false;
else {
clear_bit(TTY_THROTTLED, &tty->flags);
if (tty->ops->unthrottle)
tty->ops->unthrottle(tty);
}
}
mutex_unlock(&tty->throttle_mutex);
return ret; if (tty->flow_change != TTY_UNTHROTTLE_SAFE)
return false;
clear_bit(TTY_THROTTLED, &tty->flags);
if (tty->ops->unthrottle)
tty->ops->unthrottle(tty);
return true;
} }
/** /**