Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753564Ab2F1LEA (ORCPT ); Thu, 28 Jun 2012 07:04:00 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:39338 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299Ab2F1LD6 (ORCPT ); Thu, 28 Jun 2012 07:03:58 -0400 From: Sha Zhengju To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: kamezawa.hiroyu@jp.fujitsu.com, gthelen@google.com, yinghan@google.com, akpm@linux-foundation.org, mhocko@suse.cz, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, sage@newdream.net, ceph-devel@vger.kernel.org, Sha Zhengju Subject: [PATCH 4/7] Use vfs __set_page_dirty interface instead of doing it inside filesystem Date: Thu, 28 Jun 2012 19:03:43 +0800 Message-Id: <1340881423-5703-1-git-send-email-handai.szj@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1340880885-5427-1-git-send-email-handai.szj@taobao.com> References: <1340880885-5427-1-git-send-email-handai.szj@taobao.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3259 Lines: 104 From: Sha Zhengju Following we will treat SetPageDirty and dirty page accounting as an integrated operation. Filesystems had better use vfs interface directly to avoid those details. Signed-off-by: Sha Zhengju --- fs/buffer.c | 2 +- fs/ceph/addr.c | 20 ++------------------ include/linux/buffer_head.h | 2 ++ 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index e8d96b8..55522dd 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -610,7 +610,7 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode); * If warn is true, then emit a warning if the page is not uptodate and has * not been truncated. */ -static int __set_page_dirty(struct page *page, +int __set_page_dirty(struct page *page, struct address_space *mapping, int warn) { if (unlikely(!mapping)) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 8b67304..d028fbe 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -5,6 +5,7 @@ #include #include #include /* generic_writepages */ +#include #include #include #include @@ -73,14 +74,8 @@ static int ceph_set_page_dirty(struct page *page) int undo = 0; struct ceph_snap_context *snapc; - if (unlikely(!mapping)) - return !TestSetPageDirty(page); - - if (TestSetPageDirty(page)) { - dout("%p set_page_dirty %p idx %lu -- already dirty\n", - mapping->host, page, page->index); + if (!__set_page_dirty(page, mapping, 1)) return 0; - } inode = mapping->host; ci = ceph_inode(inode); @@ -107,14 +102,7 @@ static int ceph_set_page_dirty(struct page *page) snapc, snapc->seq, snapc->num_snaps); spin_unlock(&ci->i_ceph_lock); - /* now adjust page */ - spin_lock_irq(&mapping->tree_lock); if (page->mapping) { /* Race with truncate? */ - WARN_ON_ONCE(!PageUptodate(page)); - account_page_dirtied(page, page->mapping); - radix_tree_tag_set(&mapping->page_tree, - page_index(page), PAGECACHE_TAG_DIRTY); - /* * Reference snap context in page->private. Also set * PagePrivate so that we get invalidatepage callback. @@ -126,14 +114,10 @@ static int ceph_set_page_dirty(struct page *page) undo = 1; } - spin_unlock_irq(&mapping->tree_lock); - if (undo) /* whoops, we failed to dirty the page */ ceph_put_wrbuffer_cap_refs(ci, 1, snapc); - __mark_inode_dirty(mapping->host, I_DIRTY_PAGES); - BUG_ON(!PageDirty(page)); return 1; } diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 458f497..0a331a8 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -336,6 +336,8 @@ static inline void lock_buffer(struct buffer_head *bh) } extern int __set_page_dirty_buffers(struct page *page); +extern int __set_page_dirty(struct page *page, + struct address_space *mapping, int warn); #else /* CONFIG_BLOCK */ -- 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/