Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932293AbXJTMPp (ORCPT ); Sat, 20 Oct 2007 08:15:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753310AbXJTMPZ (ORCPT ); Sat, 20 Oct 2007 08:15:25 -0400 Received: from x346.tv-sign.ru ([89.108.83.215]:49768 "EHLO mail.screens.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbXJTMPY (ORCPT ); Sat, 20 Oct 2007 08:15:24 -0400 Date: Sat, 20 Oct 2007 16:20:21 +0400 From: Oleg Nesterov To: Andrew Morton , Jens Axboe Cc: Nick , Randy Dunlap , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] blk_sync_queue() should cancel request_queue->unplug_work Message-ID: <20071020122021.GA2490@tv-sign.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 758 Lines: 22 (untested, needs an explicit ack/nack from maintainer) blk_sync_queue() cancels the timer, but forgets to cancel the work. Signed-off-by: Oleg Nesterov --- K/block/ll_rw_blk.c~2_blk 2007-10-13 14:51:42.000000000 +0400 +++ K/block/ll_rw_blk.c 2007-10-20 16:10:08.000000000 +0400 @@ -1723,6 +1723,7 @@ EXPORT_SYMBOL(blk_stop_queue); void blk_sync_queue(struct request_queue *q) { del_timer_sync(&q->unplug_timer); + kblockd_flush_work(&q->unplug_work); } EXPORT_SYMBOL(blk_sync_queue); - 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/