From 3e6e20c43aa5e0cb16cb990bcc79221cb355d2db Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 22 Aug 2006 21:22:13 +0400
Subject: [PATCH] --- yaml --- r: 33444 b: refs/heads/master c:
 2d8f613160ed303f5fe310f21bba334a4b074fa5 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4679b2abe9e8..dd1aa438511f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00a2b0f6dd2372842df73de72d51621b539fea44
+refs/heads/master: 2d8f613160ed303f5fe310f21bba334a4b074fa5
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index bc7baeec0d10..9b72dc7c8a5c 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -765,7 +765,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);