From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org-S261970AbVF1GgR@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S261970AbVF1GgR (ORCPT <rfc822;willy@w.ods.org>);
	Tue, 28 Jun 2005 02:36:17 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261949AbVF1Gff
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 28 Jun 2005 02:35:35 -0400
Received: from ns.virtualhost.dk ([195.184.98.160]:4027 "EHLO virtualhost.dk")
	by vger.kernel.org with ESMTP id S261878AbVF1GT5 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 28 Jun 2005 02:19:57 -0400
Date: Tue, 28 Jun 2005 08:21:13 +0200
From: Jens Axboe <axboe@suse.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>, linux-kernel@vger.kernel.org
Subject: Re: cfq build breakage
Message-ID: <20050628062108.GA3411@suse.de>
References: <42C0B39E.7070509@pobox.com> <20050627201333.4c7d3d06.akpm@osdl.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050627201333.4c7d3d06.akpm@osdl.org>
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jun 27 2005, Andrew Morton wrote:
> Jeff Garzik <jgarzik@pobox.com> wrote:
> >
> > 
> > In latest git tree...
> > 
> >    CC [M]  drivers/block/cfq-iosched.o
> > drivers/block/cfq-iosched.c: In function `cfq_put_queue':
> > drivers/block/cfq-iosched.c:303: sorry, unimplemented: inlining failed 
> > in call to 'cfq_pending_requests': function body not available
> > drivers/block/cfq-iosched.c:1080: sorry, unimplemented: called from here
> > drivers/block/cfq-iosched.c: In function `__cfq_may_queue':
> > drivers/block/cfq-iosched.c:1955: warning: the address of 
> > `cfq_cfqq_must_alloc_slice', will always evaluate as `true'
> > make[2]: *** [drivers/block/cfq-iosched.o] Error 1
> > make[1]: *** [drivers/block] Error 2
> > make: *** [drivers] Error 2
> 
> hm.  The inline thing is trivial, but the misuse of
> cfq_cfqq_must_alloc_slice() means that we now wander into untested
> territory.

Indeed, which compiler errors on that?

> @@ -1969,7 +1968,7 @@ __cfq_may_queue(struct cfq_data *cfqd, s
>  		 * only allow 1 ELV_MQUEUE_MUST per slice, otherwise we
>  		 * can quickly flood the queue with writes from a single task
>  		 */
> -		if (rw == READ || !cfq_cfqq_must_alloc_slice) {
> +		if (rw == READ || !cfq_cfqq_must_alloc_slice(cfqq)) {
>  			cfq_mark_cfqq_must_alloc_slice(cfqq);
>  			return ELV_MQUEUE_MUST;
>  		}

thanks, clearly a typo but inside if 0.

-- 
Jens Axboe