]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
elv_unregister: fix possible crash on module unload
authorOleg Nesterov <oleg@tv-sign.ru>
Tue, 22 Aug 2006 17:22:13 +0000 (21:22 +0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Aug 2006 19:04:55 +0000 (12:04 -0700)
An exiting task or process which didn't do I/O yet have no io context,
elv_unregister() should check it is not NULL.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
block/elevator.c

index a0afdd317ceffb3d59f230c775da6c03740a426f..7be96bbe142c6f62c17da02688a0600aaa3acf9a 100644 (file)
@@ -766,7 +766,8 @@ void elv_unregister(struct elevator_type *e)
                read_lock(&tasklist_lock);
                do_each_thread(g, p) {
                        task_lock(p);
-                       e->ops.trim(p->io_context);
+                       if (p->io_context)
+                               e->ops.trim(p->io_context);
                        task_unlock(p);
                } while_each_thread(g, p);
                read_unlock(&tasklist_lock);