From 7763e30d086bc262b01f63438ad60b4a16a8e912 Mon Sep 17 00:00:00 2001
From: Vasily Tarasov <vtaras@openvz.org>
Date: Wed, 11 Oct 2006 13:26:30 +0200
Subject: [PATCH] --- yaml --- r: 39492 b: refs/heads/master c:
 c5841642242e9ae817275e09b36b298456dc17d2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d29f679733e8..1cc9329f0444 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e80f294c2688302f41959c57acfee7e131e489
+refs/heads/master: c5841642242e9ae817275e09b36b298456dc17d2
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index d8030a84773a..8ccd163254b8 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -1085,7 +1085,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
 	struct list_head *entry;
 	int len = 0;
 
-	spin_lock_irq(q->queue_lock);
+	spin_lock_irq(&elv_list_lock);
 	list_for_each(entry, &elv_list) {
 		struct elevator_type *__e;
 
@@ -1095,7 +1095,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
 		else
 			len += sprintf(name+len, "%s ", __e->elevator_name);
 	}
-	spin_unlock_irq(q->queue_lock);
+	spin_unlock_irq(&elv_list_lock);
 
 	len += sprintf(len+name, "\n");
 	return len;