From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [patch 2/4] vfs: add set_page_dirty_notag Date: Tue, 17 Feb 2009 16:38:20 -0800 Message-ID: <20090217163820.48a2ce68.akpm@linux-foundation.org> References: <18837.24581.181196.569183@edward.zelnet.ru> <1234530519.6519.46.camel@twins> <49957C43.7050701@gmail.com> <1234534150.6519.101.camel@twins> <18838.49922.215481.399653@edward.zelnet.ru> <1234645893.4695.8.camel@laptop> <18841.60432.329341.514726@edward.zelnet.ru> <20090217143506.f6899342.akpm@linux-foundation.org> <499B55A8.50103@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <499B55A8.50103@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Edward Shishkin Cc: peterz@infradead.org, npiggin@suse.de, rmh3093@gmail.com, randy.dunlap@oracle.com, linux-kernel@vger.kernel.org, reiserfs-devel@vger.kernel.org On Wed, 18 Feb 2009 03:26:16 +0300 Edward Shishkin wrote: > Andrew Morton wrote: > > On Tue, 17 Feb 2009 01:43:28 +0300 > > Edward Shishkin wrote: > > > > > >> + */ > >> +int set_page_dirty_notag(struct page *page) > >> +{ > >> + struct address_space *mapping = page->mapping; > >> + > >> + if (!TestSetPageDirty(page)) { > >> + WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page)); > >> + if (mapping_cap_account_dirty(mapping)) { > >> + /* > >> + * The accounting functions rely on > >> + * being atomic wrt interrupts. > >> + */ > >> + unsigned long flags; > >> + local_irq_save(flags); > >> + __inc_zone_page_state(page, NR_FILE_DIRTY); > >> + __inc_bdi_stat(mapping->backing_dev_info, > >> + BDI_RECLAIMABLE); > >> + task_dirty_inc(current); > >> + task_io_account_write(PAGE_CACHE_SIZE); > >> + local_irq_restore(flags); > >> + } > >> + __mark_inode_dirty(mapping->host, I_DIRTY_PAGES); > >> + return 1; > >> + } > >> + return 0; > >> +} > >> > > > > I'll maintain this in -mm, alongside the resier4 patches which need it. > > > > Of course, this rather obviates the purpose - if someone changes, say, > > __set_page_dirty_nobuffers() then they won't similarly update > > set_page_dirty_notag(). Oh well. > > > > This problem would fix itself if those two functions were to > > substantially share code. > > It will fix the problem only partially: > there is one more friend __set_page_dirty() in buffer.c But all three functions do the same thing? if (mapping_cap_account_dirty(mapping)) { __inc_zone_page_state(page, NR_FILE_DIRTY); __inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); task_dirty_inc(current); task_io_account_write(PAGE_CACHE_SIZE); } ? > Maybe it makes sense to add comments with warnings > in all such places, or create a header file with a static inline > function update_page_accounting() ? Could just uninline the helper function I guess - if you look, those four statements already involve doing a heck of a lot of stuff. Try it, see how it looks?