On 06/04/2014 12: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+.
It is, I misread that diff wrong. > 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); This looks better. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/