Messages in this thread Patch in this message | | | From | Ross Lagerwall <> | Subject | [PATCH] tty/vt: Return EBUSY if deallocating VT1 and it is busy | Date | Fri, 14 Jun 2013 23:24:25 +0100 |
| |
Commit 421b40a6286e ("tty/vt: Fix vc_deallocate() lock order") changed the behavior when deallocating VT 1. Previously if trying to deallocate VT1 and it is busy, we would return EBUSY. The commit changed this to return 0 (success).
This commit restores the old behavior.
Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com> --- On 06/14/2013 05:35 PM, Greg KH wrote: > p.s. In the future, please cc: the people who handled the patch you are > asking about, otherwise stuff like this often gets missed in the noise > of lkml.
Yes, sorry about that. I only remembered after I sent the email.
drivers/tty/vt/vt_ioctl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index fc2c06c..2bd78e2 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -289,13 +289,10 @@ static int vt_disallocate(unsigned int vc_num) struct vc_data *vc = NULL; int ret = 0; - if (!vc_num) - return 0; - console_lock(); if (VT_BUSY(vc_num)) ret = -EBUSY; - else + else if (vc_num) vc = vc_deallocate(vc_num); console_unlock(); -- 1.8.3.1
| |