From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964788AbWDZOYV (ORCPT ); Wed, 26 Apr 2006 10:24:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964789AbWDZOYV (ORCPT ); Wed, 26 Apr 2006 10:24:21 -0400 Received: from stat9.steeleye.com ([209.192.50.41]:32152 "EHLO hancock.sc.steeleye.com") by vger.kernel.org with ESMTP id S964788AbWDZOYV (ORCPT ); Wed, 26 Apr 2006 10:24:21 -0400 Subject: Re: [PATCH] likely cleanup: revert unlikely in ll_back_merge_fn From: James Bottomley To: Jens Axboe Cc: Hua Zhong , linux-kernel@vger.kernel.org, akpm@osdl.org In-Reply-To: <20060426135548.GD5083@suse.de> References: <20060425183026.GR4102@suse.de> <004d01c668b0$a9c79540$853d010a@nuitysystems.com> <20060426052049.GV4102@suse.de> <1146059435.3908.3.camel@mulgrave.il.steeleye.com> <20060426135548.GD5083@suse.de> Content-Type: text/plain Date: Wed, 26 Apr 2006 09:24:15 -0500 Message-Id: <1146061455.3908.11.camel@mulgrave.il.steeleye.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 (2.2.3-4.fc4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2006-04-26 at 15:55 +0200, Jens Axboe wrote: > On Wed, Apr 26 2006, James Bottomley wrote: > > On Wed, 2006-04-26 at 07:20 +0200, Jens Axboe wrote: > > > But blk_recount_segments() sets the BIO_SEG_VALID flag. Ugh ok > > > __bio_add_page() basically kills the flag. James, I think you are the > > > author of that addition, does it really need to be so restrictive? > > > > > > /* If we may be able to merge these biovecs, force a recount */ > > > if (bio->bi_vcnt && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec) || > > > BIOVEC_VIRT_MERGEABLE(bvec-1, bvec))) > > > bio->bi_flags &= ~(1 << BIO_SEG_VALID); > > > > Help me out here ... I can't find this chunk of code in the current > > tree. Where is it? > > Sorry, should have mentioned that. Current git tree (or 2.6.16 should be > the same), fs/bio.c:__bio_add_page():401. OK, that's this change. http://www.kernel.org/git/?p=linux/kernel/git/tglx/history.git;a=commit;h=2fed84384a0b084d78252aa14d6bfae03deb268f I think the reason for this is that the bi_hw_back_size and bi_hw_front size aren't updated without a segment recount, so you could get rid of the valid flag clearing if you introduce a heuristic to update them. James