From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: [PATCH block/for-next] block: don't call blk_drain_queue() if elevator is not up Date: Fri, 04 Nov 2011 09:12:19 +0100 Message-ID: <4EB39E63.9020804@kernel.dk> References: <4EB2BC88.3070105@suse.cz> <20111103161436.GJ4417@google.com> <20111103162634.GK4417@google.com> <4EB2D441.9040708@kernel.dk> <20111103211253.GO4417@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20111103211253.GO4417@google.com> Sender: linux-kernel-owner@vger.kernel.org To: Tejun Heo Cc: Jiri Slaby , "James E.J. Bottomley" , LKML , linux-scsi , Jiri Slaby List-Id: linux-scsi@vger.kernel.org On 2011-11-03 22:12, Tejun Heo wrote: > On Thu, Nov 03, 2011 at 06:49:53PM +0100, Jens Axboe wrote: >>> Fix it by making blk_cleanup_queue() check whether q->elevator is set >>> up before invoking blk_drain_queue. >> >> Thanks, glad this got caught before the merge... > > Heh, yeah, definitely, and just to be paranoid, this whole thing is > for the next merge window. Ehm, what parts? If the bug is in for-next, things are queued up for _this_ merge window. -- Jens Axboe