iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] uml: SIGWINCH handling cleanup

Browse Source 
Code cleanup - unregister_winch and winch_cleanup had some duplicate code.
This is now abstracted out into free_winch.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2006-01-06 00:19:01 -08:00 committed by Linus Torvalds
parent 7eebe8a9c5
commit e464bf2bed
1 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
arch/um/drivers/line.c
View File

@ -774,55 +774,49 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)
printk("register_winch_irq - failed to register IRQ\n"); printk("register_winch_irq - failed to register IRQ\n");
} }
static void unregister_winch(struct tty_struct *tty) static void free_winch(struct winch *winch)
{ {
struct list_head *ele;
struct winch *winch, *found = NULL;
spin_lock(&winch_handler_lock);
list_for_each(ele, &winch_handlers){
winch = list_entry(ele, struct winch, list);
if(winch->tty == tty){
found = winch;
break;
}
}
if(found == NULL)
goto err;
list_del(&winch->list); list_del(&winch->list);
spin_unlock(&winch_handler_lock);
if(winch->pid != -1) if(winch->pid != -1)
os_kill_process(winch->pid, 1); os_kill_process(winch->pid, 1);
if(winch->fd != -1)
os_close_file(winch->fd);
free_irq(WINCH_IRQ, winch); free_irq(WINCH_IRQ, winch);
kfree(winch); kfree(winch);
return;
err:
spin_unlock(&winch_handler_lock);
} }
/* XXX: No lock as it's an exitcall... is this valid? Depending on cleanup static void unregister_winch(struct tty_struct *tty)
* order... are we sure that nothing else is done on the list? */
static void winch_cleanup(void)
{ {
struct list_head *ele; struct list_head *ele;
struct winch *winch; struct winch *winch;
spin_lock(&winch_handler_lock);
list_for_each(ele, &winch_handlers){ list_for_each(ele, &winch_handlers){
winch = list_entry(ele, struct winch, list); winch = list_entry(ele, struct winch, list);
if(winch->fd != -1){ if(winch->tty == tty){
/* Why is this different from the above free_irq(), free_winch(winch);
* which deactivates SIGIO? This searches the FD break;
* somewhere else and removes it from the list... */ }
deactivate_fd(winch->fd, WINCH_IRQ); }
os_close_file(winch->fd); spin_unlock(&winch_handler_lock);
} }
if(winch->pid != -1)
os_kill_process(winch->pid, 1); static void winch_cleanup(void)
{
struct list_head *ele, *next;
struct winch *winch;
spin_lock(&winch_handler_lock);
list_for_each_safe(ele, next, &winch_handlers){
winch = list_entry(ele, struct winch, list);
free_winch(winch);
} }
spin_unlock(&winch_handler_lock);
} }
__uml_exitcall(winch_cleanup); __uml_exitcall(winch_cleanup);