Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751588AbaFDUBP (ORCPT ); Wed, 4 Jun 2014 16:01:15 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:64850 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777AbaFDUBO (ORCPT ); Wed, 4 Jun 2014 16:01:14 -0400 Message-ID: <538F7B05.70705@bjorling.me> Date: Wed, 04 Jun 2014 22:01:09 +0200 From: Matias Bjorling User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Keith Busch , Jens Axboe CC: willy@linux.intel.com, sbradshaw@micron.com, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, hch@infradead.org Subject: Re: [PATCH v5] conversion to blk-mq References: <1401742510-10827-1-git-send-email-m@bjorling.me> <538E2C2E.1010500@bjorling.me> <538EE3E6.60408@bjorling.me> <538F68A9.50608@kernel.dk> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/04/2014 08:52 PM, Keith Busch wrote: > On Wed, 4 Jun 2014, Jens Axboe wrote: >> On 06/04/2014 12:28 PM, Keith Busch wrote: >> Are you testing against 3.13? You really need the current tree for this, >> otherwise I'm sure you'll run into issues (as you appear to be :-) > > I'm using Matias' current tree: > > git://github.com/MatiasBjorling/linux-collab nvmeq_wip_6 > > Is this the right one to use? Looks like a 3.15rc1+. > > Also ... obviously that's the wrong diff from before. I didn't save my > file before creating the diff. Should have looked like this: > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index d10013b..d1b986c 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -105,7 +105,8 @@ static int blk_mq_queue_enter(struct request_queue *q) > __percpu_counter_add(&q->mq_usage_counter, 1, 1000000); > smp_wmb(); > /* we have problems to freeze the queue if it's initializing */ > - if (!blk_queue_bypass(q) || !blk_queue_init_done(q)) > + if (!blk_queue_dying(q) && (!blk_queue_bypass(q) || > + !blk_queue_init_done(q))) > return 0; > > __percpu_counter_add(&q->mq_usage_counter, -1, 1000000); Thanks! I've put your patch into the nvmemq_wip_v6 branch and rebased it on top of Jens' for-linus. -- 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/