aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorVasily Tarasov <vtaras@openvz.org>2006-10-11 13:26:30 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-10-12 15:08:51 +0200
commitc5841642242e9ae817275e09b36b298456dc17d2 (patch)
treebe4c37fe2119ece7cc6d09a625cbf778d08e2ef8 /block
parente6e80f294c2688302f41959c57acfee7e131e489 (diff)
downloadlinux-linaro-stable-c5841642242e9ae817275e09b36b298456dc17d2.tar.gz
[PATCH] block layer: elv_iosched_show should get elv_list_lock
elv_iosched_show function iterates other elv_list, hence elv_list_lock should be got. Signed-off-by: Vasily Tarasov <vtaras@openvz.org> Signed-off-by: Vasily Tarasov <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c
index d8030a84773a..8ccd163254b8 100644
--- a/block/elevator.c
+++ b/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;