Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161448AbWJKVK7 (ORCPT ); Wed, 11 Oct 2006 17:10:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161443AbWJKVKi (ORCPT ); Wed, 11 Oct 2006 17:10:38 -0400 Received: from mail.kroah.org ([69.55.234.183]:5797 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1161450AbWJKVKe (ORCPT ); Wed, 11 Oct 2006 17:10:34 -0400 Date: Wed, 11 Oct 2006 14:09:20 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Vasily Tarasov , Jens Axboe , Greg Kroah-Hartman Subject: [patch 67/67] block layer: elv_iosched_show should get elv_list_lock Message-ID: <20061011210920.GP16627@kroah.com> References: <20061011204756.642936754@quad.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="block-layer-elv_iosched_show-should-get-elv_list_lock.patch" In-Reply-To: <20061011210310.GA16627@kroah.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1416 Lines: 49 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Vasily Tarasov elv_iosched_show function iterates other elv_list, hence elv_list_lock should be got. Also the question is: in elv_iosched_show, elv_iosched_store q->elevator->elevator_type construction is used without locking q->queue_lock. Is it expected?.. Signed-off-by: Vasily Tarasov Cc: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/elevator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.18.orig/block/elevator.c +++ linux-2.6.18/block/elevator.c @@ -892,7 +892,7 @@ ssize_t elv_iosched_show(request_queue_t 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; @@ -902,7 +902,7 @@ ssize_t elv_iosched_show(request_queue_t 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; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/