Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933572AbWKWUUp (ORCPT ); Thu, 23 Nov 2006 15:20:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933886AbWKWUUp (ORCPT ); Thu, 23 Nov 2006 15:20:45 -0500 Received: from hellhawk.shadowen.org ([80.68.90.175]:33552 "EHLO hellhawk.shadowen.org") by vger.kernel.org with ESMTP id S933572AbWKWUUo (ORCPT ); Thu, 23 Nov 2006 15:20:44 -0500 Message-ID: <45660298.3090003@shadowen.org> Date: Thu, 23 Nov 2006 20:20:40 +0000 From: Andy Whitcroft User-Agent: Thunderbird 1.5.0.7 (X11/20060927) MIME-Version: 1.0 To: Andrew Morton CC: Mariusz Kozlowski , linux-kernel@vger.kernel.org Subject: Re: 2.6.19-rc6-mm1 References: <20061123021703.8550e37e.akpm@osdl.org> <200611231223.48703.m.kozlowski@tuxland.pl> <20061123103607.af7ae8b0.akpm@osdl.org> In-Reply-To: <20061123103607.af7ae8b0.akpm@osdl.org> X-Enigmail-Version: 0.94.0.0 OpenPGP: url=http://www.shadowen.org/~apw/public-key Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2363 Lines: 68 Andrew Morton wrote: > On Thu, 23 Nov 2006 12:23:48 +0100 > Mariusz Kozlowski wrote: > >> Hello, >> >> Hmmm ... didn't apply cleanly. >> >> patching file kernel/tsacct.c >> Hunk #1 FAILED at 97. >> 1 out of 1 hunk FAILED -- saving rejects to file kernel/tsacct.c.rej > > I think your local tree is not clean. I get this accross the board on my test system too. All clean downloads. A quick look at the combo-patch and the broken-out patch seems to indicate they are not in sync with each other. In the combo-patch we have this hunk (which is the one which fails): --- linux-2.6.19-rc6/kernel/tsacct.c 2006-11-16 23:19:32.000000000 -0800 +++ devel/kernel/tsacct.c 2006-11-23 01:12:17.000000000 -0800 @@ -97,7 +97,14 @@ void xacct_add_tsk(struct taskstats *sta stats->read_syscalls = p->syscr; stats->write_syscalls = p->syscw; #ifdef CONFIG_TASK_IO_ACCOUNTING - stats->read_bytes = p->ioac->read_bytes + stats->read_bytes = p->ioac.read_bytes; + stats->write_bytes = p->ioac.write_bytes; + stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes; +#else + stats->read_bytes = 0; + stats->write_bytes = 0; + stats->cancelled_write_bytes = 0; +#endif In the broken-out directory the only patch which references this file has the following different hunk: --- a/kernel/tsacct.c~io-accounting-via-taskstats +++ a/kernel/tsacct.c @@ -96,6 +96,15 @@ void xacct_add_tsk(struct taskstats *sta stats->write_char = 0; stats->read_syscalls = p->syscr; stats->write_syscalls = p->syscw; +#ifdef CONFIG_TASK_IO_ACCOUNTING + stats->read_bytes = p->ioac.read_bytes; + stats->write_bytes = p->ioac.write_bytes; + stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes; +#else + stats->read_bytes = 0; + stats->write_bytes = 0; + stats->cancelled_write_bytes = 0; +#endif } #undef KB #undef MB Looking at 2.6.19-rc6 this second version seems completely reasonable. The former does not. -apw - 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/