From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758019Ab2BMWwy (ORCPT ); Mon, 13 Feb 2012 17:52:54 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:48527 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753296Ab2BMWww (ORCPT ); Mon, 13 Feb 2012 17:52:52 -0500 Date: Mon, 13 Feb 2012 14:52:48 -0800 From: Tejun Heo To: Jens Axboe , linux-kernel@vger.kernel.org, Vivek Goyal Subject: [PATCH block/for-linus] block: blk-throttle should be drained regardless of q->elevator Message-ID: <20120213225248.GH12117@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, blk_cleanup_queue() doesn't call elv_drain_elevator() if q->elevator doesn't exist; however, bio based drivers don't have elevator initialized but can still use blk-throttle. This patch moves q->elevator test inside blk_drain_queue() such that only elv_drain_elevator() is skipped if !q->elevator. Signed-off-by: Tejun Heo Reported-by: Vivek Goyal --- block/blk-core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) Index: work/block/blk-core.c =================================================================== --- work.orig/block/blk-core.c +++ work/block/blk-core.c @@ -365,7 +365,13 @@ void blk_drain_queue(struct request_queu spin_lock_irq(q->queue_lock); - elv_drain_elevator(q); + /* + * The caller might be trying to drain @q before its + * elevator is initialized. + */ + if (q->elevator) + elv_drain_elevator(q); + if (drain_all) blk_throtl_drain(q); @@ -428,13 +434,8 @@ void blk_cleanup_queue(struct request_qu spin_unlock_irq(lock); mutex_unlock(&q->sysfs_lock); - /* - * Drain all requests queued before DEAD marking. The caller might - * be trying to tear down @q before its elevator is initialized, in - * which case we don't want to call into draining. - */ - if (q->elevator) - blk_drain_queue(q, true); + /* drain all requests queued before DEAD marking */ + blk_drain_queue(q, true); /* @q won't process any more request, flush async actions */ del_timer_sync(&q->backing_dev_info.laptop_mode_wb_timer);