From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263760AbTKJOQU (ORCPT ); Mon, 10 Nov 2003 09:16:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263764AbTKJOQU (ORCPT ); Mon, 10 Nov 2003 09:16:20 -0500 Received: from mail-04.iinet.net.au ([203.59.3.36]:42631 "HELO mail.iinet.net.au") by vger.kernel.org with SMTP id S263760AbTKJOQS (ORCPT ); Mon, 10 Nov 2003 09:16:18 -0500 Message-ID: <3FAF9DAE.3070307@cyberone.com.au> Date: Tue, 11 Nov 2003 01:16:14 +1100 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030827 Debian/1.4-3 X-Accept-Language: en MIME-Version: 1.0 To: Jens Axboe CC: linux-kernel@vger.kernel.org, ckrm-tech@lists.sourceforge.net Subject: Re: [PATCH] cfq-prio #2 References: <20031110140052.GC32637@suse.de> In-Reply-To: <20031110140052.GC32637@suse.de> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Jens Axboe wrote: >Hi, > > Hi Jens >@@ -1553,6 +1559,10 @@ > struct io_context *ioc = get_io_context(gfp_mask); > > spin_lock_irq(q->queue_lock); >+ >+ if (!elv_may_queue(q, rw)) >+ goto out_lock; >+ > if (rl->count[rw]+1 >= q->nr_requests) { > /* > * The queue will fill after this allocation, so set it as >@@ -1566,15 +1576,12 @@ > } > } > >- if (blk_queue_full(q, rw) >- && !ioc_batching(ioc) && !elv_may_queue(q, rw)) { > I know I hijacked elv_may_queue from you... any chance we could seperate these so our schedulers can live in peace? ;) Maybe my version should be called elv_force_queue?