From patchwork Tue Feb 15 16:30:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 83269 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8D7C7B7163 for ; Wed, 16 Feb 2011 03:30:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752990Ab1BOQaw (ORCPT ); Tue, 15 Feb 2011 11:30:52 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:62053 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751362Ab1BOQav (ORCPT ); Tue, 15 Feb 2011 11:30:51 -0500 Received: by bwz15 with SMTP id 15so602112bwz.19 for ; Tue, 15 Feb 2011 08:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=R3UVJqr44m5NUTQZMW+JqizyQ2VwOYsPu5byOKg5X2c=; b=YzrLTI71ZN1ZeXU8tchbO1Iv5RBYRW0iDUx6u7dDuDO1e4l5n8Zy6l8yqdsLqKLwfr RPmy5VWYNgMFKWCmgPE6ck4aRR0LRhoW72be46vVLcwbR14un00thUjh280Ioooty//8 mcNiosNBUJu/pQNsqI+Ykv3rJVPvlF1/kDvlY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=dR/MAmxaFVNpN6nHzTFueRhsjaKK2WxIG/Q4Wj5eIWHnsS7dp2alYmAEB4GP7+5t+q rTAm3Pq+qLBnqZEwttkKyT3KNe1zfVG4XsKgH7nU8qBkcYMnPa8RBnOBr6Bxdo1pLfbv GJYPtKzXJRxoWIF0q1BCIywiHNvYrL1jlHPWM= Received: by 10.204.129.83 with SMTP id n19mr272700bks.207.1297787450388; Tue, 15 Feb 2011 08:30:50 -0800 (PST) Received: from htj.dyndns.org ([130.75.117.88]) by mx.google.com with ESMTPS id b6sm2715652bkb.22.2011.02.15.08.30.48 (version=SSLv3 cipher=OTHER); Tue, 15 Feb 2011 08:30:49 -0800 (PST) Date: Tue, 15 Feb 2011 17:30:46 +0100 From: Tejun Heo To: Jan Beulich Cc: linux-ide@vger.kernel.org Subject: Re: old ide driver incompatible with new flush implementation (was: conflicting commits (block flush vs. ide)) Message-ID: <20110215163046.GO3160@htj.dyndns.org> References: <4D5A75650200007800031F9C@vpn.id2.novell.com> <20110215151314.GJ3160@htj.dyndns.org> <4D5AB5D0020000780003207A@vpn.id2.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D5AB5D0020000780003207A@vpn.id2.novell.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On Tue, Feb 15, 2011 at 04:20:16PM +0000, Jan Beulich wrote: > > Yeah, right. blk_flush_complete_seq_end_io() is on completion path > > and shouldn't call directly into request_fn. Can you please test > > whether the following patch fixes the problem? > > Isn't that rather meant to deal with the first of the two cases (i.e. > not the one above, where the problem is with the direct call to > request_fn from __generic_unplug_device())? Right, didn't realize there were two issues. The following should take care of the second one. diff --git a/block/blk-flush.c b/block/blk-flush.c index 54b123d..fbaa037 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -130,7 +130,7 @@ static struct request *queue_next_fseq(struct request_queue *q) BUG(); } - elv_insert(q, rq, ELEVATOR_INSERT_FRONT); + elv_insert(q, rq, ELEVATOR_INSERT_REQUEUE); return rq; }