X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=block%2Felevator.c;fp=block%2Felevator.c;h=7be96bbe142c6f62c17da02688a0600aaa3acf9a;hb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;hp=a0afdd317ceffb3d59f230c775da6c03740a426f;hpb=1db395853d4f30d6120458bd279ede1f882a8525;p=linux-2.6.git

diff --git a/block/elevator.c b/block/elevator.c
index a0afdd317..7be96bbe1 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -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);