Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753372Ab0HTPge (ORCPT ); Fri, 20 Aug 2010 11:36:34 -0400 Received: from cobra.newdream.net ([66.33.216.30]:50894 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752944Ab0HTPgd (ORCPT ); Fri, 20 Aug 2010 11:36:33 -0400 Date: Fri, 20 Aug 2010 08:37:03 -0700 (PDT) From: Sage Weil To: Wu Fengguang cc: Michael Rubin , "linux-kernel@vger.kernel.org" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "jack@suse.cz" , "riel@redhat.com" , "akpm@linux-foundation.org" , "david@fromorbit.com" , "npiggin@kernel.dk" , "hch@lst.de" , "axboe@kernel.dk" Subject: Re: [PATCH 1/4] mm: exporting account_page_dirty In-Reply-To: <20100820093951.GA8440@localhost> Message-ID: References: <1282296689-25618-1-git-send-email-mrubin@google.com> <1282296689-25618-2-git-send-email-mrubin@google.com> <20100820093951.GA8440@localhost> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2269 Lines: 67 On Fri, 20 Aug 2010, Wu Fengguang wrote: > Sage, > > This is actually a bug fix for ceph, which missed the task_dirty_inc() > call in account_page_dirty(). > > Reviewed-by: Wu Fengguang Thanks, I missed this one earlier. I'll queue it up. sage > > On Fri, Aug 20, 2010 at 05:31:26PM +0800, Michael Rubin wrote: > > This allows code outside of the mm core to safely manipulate page state > > and not worry about the other accounting. Not using these routines means > > that some code will lose track of the accounting and we get bugs. This > > has happened once already. > > > > Signed-off-by: Michael Rubin > > --- > > fs/ceph/addr.c | 8 +------- > > mm/page-writeback.c | 1 + > > 2 files changed, 2 insertions(+), 7 deletions(-) > > > > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c > > index 5598a0d..420d469 100644 > > --- a/fs/ceph/addr.c > > +++ b/fs/ceph/addr.c > > @@ -105,13 +105,7 @@ static int ceph_set_page_dirty(struct page *page) > > spin_lock_irq(&mapping->tree_lock); > > if (page->mapping) { /* Race with truncate? */ > > WARN_ON_ONCE(!PageUptodate(page)); > > - > > - if (mapping_cap_account_dirty(mapping)) { > > - __inc_zone_page_state(page, NR_FILE_DIRTY); > > - __inc_bdi_stat(mapping->backing_dev_info, > > - BDI_RECLAIMABLE); > > - task_io_account_write(PAGE_CACHE_SIZE); > > - } > > + account_page_dirtied(page, page->mapping); > > radix_tree_tag_set(&mapping->page_tree, > > page_index(page), PAGECACHE_TAG_DIRTY); > > > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > > index 7262aac..9d07a8d 100644 > > --- a/mm/page-writeback.c > > +++ b/mm/page-writeback.c > > @@ -1131,6 +1131,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping) > > task_io_account_write(PAGE_CACHE_SIZE); > > } > > } > > +EXPORT_SYMBOL(account_page_dirtied); > > > > /* > > * For address_spaces which do not use buffers. Just tag the page as dirty in > > -- > > 1.7.1 > > -- 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/