Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932411AbWLSAFF (ORCPT ); Mon, 18 Dec 2006 19:05:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932408AbWLSAFF (ORCPT ); Mon, 18 Dec 2006 19:05:05 -0500 Received: from smtp.osdl.org ([65.172.181.25]:33251 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932411AbWLSAFD (ORCPT ); Mon, 18 Dec 2006 19:05:03 -0500 Date: Mon, 18 Dec 2006 16:04:45 -0800 (PST) From: Linus Torvalds To: Andrei Popa cc: Peter Zijlstra , Andrew Morton , Linux Kernel Mailing List , Hugh Dickins , Florian Weimer , Marc Haber , Martin Michlmayr Subject: Re: 2.6.19 file content corruption on ext3 In-Reply-To: <1166485691.6977.6.camel@localhost> Message-ID: References: <1166314399.7018.6.camel@localhost> <20061217040620.91dac272.akpm@osdl.org> <1166362772.8593.2.camel@localhost> <20061217154026.219b294f.akpm@osdl.org> <1166460945.10372.84.camel@twins> <1166466272.10372.96.camel@twins> <1166468651.6983.6.camel@localhost> <1166471069.6940.4.camel@localhost> <1166476297.6862.1.camel@localhost> <1166485691.6977.6.camel@localhost> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1625 Lines: 55 On Tue, 19 Dec 2006, Andrei Popa wrote: > > > > There's exactly two call sites that call "page_mkclean()" (an dthat is the > > only thing in turn that calls "page_mkclean_one()", which we already > > determined will cause the corruption). > > > > Can you just TOTALLY DISABLE that case for the test_clear_page_dirty() > > case? Just do an "#if 0 .. #endif" around that whole if-statement, leaving > > the _only_ thing that actually calls "page_mkclean()" to be the > > "clear_page_dirty_for_io()" call. > > > > Do you still see corruption? > > nope, no file corruption at all. Ok. That's interesting, but I think you actually #ifdef'ed out too much: > + > +#if 0 > if (TestClearPageDirty(page)) { > radix_tree_tag_clear(&mapping->page_tree, > page_index(page), PAGECACHE_TAG_DIRTY); > @@ -866,11 +868,19 @@ int test_clear_page_dirty(struct page *p > * page is locked, which pins the address_space > */ > if (mapping_cap_account_dirty(mapping)) { > - page_mkclean(page); > + int cleaned = page_mkclean(page); > + if (!must_clean_ptes && cleaned){ > + WARN_ON(1); > + set_page_dirty(page); > + } > + > dec_zone_page_state(page, NR_FILE_DIRTY); > } > return 1; > } > + > +#endif > + It was really just the _inner_ "if (mapping_cap_account_dirty(.." statement that I meant you should remove. Can you try that too? Linus - 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/