Commit af815336 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: change tty_write_lock()'s ndelay parameter to bool 



It's a yes-no parameter, so convert it to bool to be obvious.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-6-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d28dfed

drivers/tty/tty.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int tty_check_change(struct tty_struct *tty); 
void __stop_tty(struct tty_struct *tty);

void __start_tty(struct tty_struct *tty);

void tty_write_unlock(struct tty_struct *tty);

int tty_write_lock(struct tty_struct *tty, int ndelay);

int tty_write_lock(struct tty_struct *tty, bool ndelay);

void tty_vhangup_session(struct tty_struct *tty);

void tty_open_proc_set_tty(struct file *filp, struct tty_struct *tty);

int tty_signal_session_leader(struct tty_struct *tty, int exit_session);

drivers/tty/tty_io.c

+3 −3
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ void tty_write_unlock(struct tty_struct *tty) 
	wake_up_interruptible_poll(&tty->write_wait, EPOLLOUT);

}



int tty_write_lock(struct tty_struct *tty, int ndelay)

int tty_write_lock(struct tty_struct *tty, bool ndelay)

{

	if (!mutex_trylock(&tty->atomic_write_lock)) {

		if (ndelay)
@@ -1160,7 +1160,7 @@ int tty_send_xchar(struct tty_struct *tty, char ch) 
		return 0;

	}



	if (tty_write_lock(tty, 0) < 0)

	if (tty_write_lock(tty, false) < 0)

		return -ERESTARTSYS;



	down_read(&tty->termios_rwsem);
@@ -2486,7 +2486,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration) 
		retval = tty->ops->break_ctl(tty, duration);

	else {

		/* Do the work ourselves */

		if (tty_write_lock(tty, 0) < 0)

		if (tty_write_lock(tty, false) < 0)

			return -EINTR;

		retval = tty->ops->break_ctl(tty, -1);

		if (retval)

drivers/tty/tty_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt) 
		if (retval < 0)

			return retval;



		if (tty_write_lock(tty, 0) < 0)

		if (tty_write_lock(tty, false) < 0)

			goto retry_write_wait;



		/* Racing writer? */