Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be1bc288 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

tty: introduce wait_event_interruptible_tty 



Calling wait_event_interruptible implicitly
releases the BKL when it sleeps, but we need
to do this explcitly when we have converted
it to a mutex.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4e608671

drivers/char/cyclades.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1607,7 +1607,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp) 
	 * If the port is the middle of closing, bail out now

	 * If the port is the middle of closing, bail out now

	 */

	 */

	if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {

	if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {

		wait_event_interruptible(info->port.close_wait,

		wait_event_interruptible_tty(info->port.close_wait,

				!(info->port.flags & ASYNC_CLOSING));

				!(info->port.flags & ASYNC_CLOSING));

		return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;

		return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;

	}

	}

drivers/char/istallion.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -954,7 +954,7 @@ static int stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned l 
 *	order of opens and closes may not be preserved across shared

 *	order of opens and closes may not be preserved across shared

 *	memory, so we must wait until it is complete.

 *	memory, so we must wait until it is complete.

 */

 */

	wait_event_interruptible(portp->raw_wait,

	wait_event_interruptible_tty(portp->raw_wait,

			!test_bit(ST_CLOSING, &portp->state));

			!test_bit(ST_CLOSING, &portp->state));

	if (signal_pending(current)) {

	if (signal_pending(current)) {

		return -ERESTARTSYS;

		return -ERESTARTSYS;
@@ -989,7 +989,7 @@ static int stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned l 
	set_bit(ST_OPENING, &portp->state);

	set_bit(ST_OPENING, &portp->state);

	spin_unlock_irqrestore(&brd_lock, flags);

	spin_unlock_irqrestore(&brd_lock, flags);





	wait_event_interruptible(portp->raw_wait,

	wait_event_interruptible_tty(portp->raw_wait,

			!test_bit(ST_OPENING, &portp->state));

			!test_bit(ST_OPENING, &portp->state));

	if (signal_pending(current))

	if (signal_pending(current))

		rc = -ERESTARTSYS;

		rc = -ERESTARTSYS;
@@ -1020,7 +1020,7 @@ static int stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned 
 *	occurs on this port.

 *	occurs on this port.

 */

 */

	if (wait) {

	if (wait) {

		wait_event_interruptible(portp->raw_wait,

		wait_event_interruptible_tty(portp->raw_wait,

				!test_bit(ST_CLOSING, &portp->state));

				!test_bit(ST_CLOSING, &portp->state));

		if (signal_pending(current)) {

		if (signal_pending(current)) {

			return -ERESTARTSYS;

			return -ERESTARTSYS;
@@ -1052,7 +1052,7 @@ static int stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned 
 *	to come back.

 *	to come back.

 */

 */

	rc = 0;

	rc = 0;

	wait_event_interruptible(portp->raw_wait,

	wait_event_interruptible_tty(portp->raw_wait,

			!test_bit(ST_CLOSING, &portp->state));

			!test_bit(ST_CLOSING, &portp->state));

	if (signal_pending(current))

	if (signal_pending(current))

		rc = -ERESTARTSYS;

		rc = -ERESTARTSYS;
@@ -1073,6 +1073,10 @@ static int stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned 




static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback)

static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback)

{

{

	/*

	 * no need for wait_event_tty because clearing ST_CMDING cannot block

	 * on BTM

	 */

	wait_event_interruptible(portp->raw_wait,

	wait_event_interruptible(portp->raw_wait,

			!test_bit(ST_CMDING, &portp->state));

			!test_bit(ST_CMDING, &portp->state));

	if (signal_pending(current))

	if (signal_pending(current))

drivers/char/n_r3964.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1079,7 +1079,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, 
				goto unlock;

				goto unlock;

			}

			}

			/* block until there is a message: */

			/* block until there is a message: */

			wait_event_interruptible(pInfo->read_wait,

			wait_event_interruptible_tty(pInfo->read_wait,

					(pMsg = remove_msg(pInfo, pClient)));

					(pMsg = remove_msg(pInfo, pClient)));

		}

		}

drivers/char/tty_port.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -231,7 +231,7 @@ int tty_port_block_til_ready(struct tty_port *port, 




	/* block if port is in the process of being closed */

	/* block if port is in the process of being closed */

	if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {

	if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {

		wait_event_interruptible(port->close_wait,

		wait_event_interruptible_tty(port->close_wait,

				!(port->flags & ASYNC_CLOSING));

				!(port->flags & ASYNC_CLOSING));

		if (port->flags & ASYNC_HUP_NOTIFY)

		if (port->flags & ASYNC_HUP_NOTIFY)

			return -EAGAIN;

			return -EAGAIN;

drivers/char/vt_ioctl.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ static void vt_event_wait(struct vt_event_wait *vw) 
	list_add(&vw->list, &vt_events);

	list_add(&vw->list, &vt_events);

	spin_unlock_irqrestore(&vt_event_lock, flags);

	spin_unlock_irqrestore(&vt_event_lock, flags);

	/* Wait for it to pass */

	/* Wait for it to pass */

	wait_event_interruptible(vt_event_waitqueue, vw->done);

	wait_event_interruptible_tty(vt_event_waitqueue, vw->done);

	/* Dequeue it */

	/* Dequeue it */

	spin_lock_irqsave(&vt_event_lock, flags);

	spin_lock_irqsave(&vt_event_lock, flags);

	list_del(&vw->list);

	list_del(&vw->list);
@@ -1761,10 +1761,13 @@ int vt_move_to_console(unsigned int vt, int alloc) 
		return -EIO;

		return -EIO;

	}

	}

	release_console_sem();

	release_console_sem();

	tty_lock();

	if (vt_waitactive(vt + 1)) {

	if (vt_waitactive(vt + 1)) {

		pr_debug("Suspend: Can't switch VCs.");

		pr_debug("Suspend: Can't switch VCs.");

		tty_unlock();

		return -EINTR;

		return -EINTR;

	}

	}

	tty_unlock();

	return prev;

	return prev;

}

}