From patchwork Tue Dec 25 17:24:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sha Zhengju X-Patchwork-Id: 1910061 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D3ECDDF23A for ; Tue, 25 Dec 2012 17:24:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754048Ab2LYRYy (ORCPT ); Tue, 25 Dec 2012 12:24:54 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:58208 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753921Ab2LYRYx (ORCPT ); Tue, 25 Dec 2012 12:24:53 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so4533996pad.5 for ; Tue, 25 Dec 2012 09:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=6UScexpJ9G6K5+Y2853dfwGm1WqIM76NAoCQhu4KKdc=; b=PDsJitLJvnsXqNOYStRN62S0IHD3tHdfAlhb7VUePn+CleO696Id9/wXaFgCpl5R0D 0CobX5eY8DPEIo78diHWTMJhawrLcWBO/2O12dPXGW2uyr40GiINKK/YWcmweljlYNfR 7PjkFKg7qftC7BowdFwf6zn7jEgY0kiG1c9OPh0V+lMAkAQ+GrSeIPUzhOKCBi6f4mqa H6muJybnH70F+6GWpquMZfja3q8u4n01eKQzxAYYu0gK1KR78Vq2FqB0fsYr0YS6CdLu 7M+sE7VdyoK6WTPVTAxZpemwGvirqRJ3wEbLPwja1lEvzJpZPnQp1pcJ17j6u8fADorm QLWg== X-Received: by 10.68.230.103 with SMTP id sx7mr78769297pbc.19.1356456293167; Tue, 25 Dec 2012 09:24:53 -0800 (PST) Received: from localhost.localdomain ([118.186.58.223]) by mx.google.com with ESMTPS id o11sm14377387pby.8.2012.12.25.09.24.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Dec 2012 09:24:52 -0800 (PST) From: Sha Zhengju To: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, ceph-devel@vger.kernel.org Cc: sage@newdream.net, dchinner@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, kamezawa.hiroyu@jp.fujitsu.com, gthelen@google.com, fengguang.wu@intel.com, glommer@parallels.com, Sha Zhengju Subject: [PATCH V3 3/8] use vfs __set_page_dirty interface instead of doing it inside filesystem Date: Wed, 26 Dec 2012 01:24:21 +0800 Message-Id: <1356456261-14579-1-git-send-email-handai.szj@taobao.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1356455919-14445-1-git-send-email-handai.szj@taobao.com> References: <1356455919-14445-1-git-send-email-handai.szj@taobao.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 Acked-by: Sage Weil Acked-by: KAMEZAWA Hiroyuki --- fs/buffer.c | 3 ++- fs/ceph/addr.c | 20 ++------------------ include/linux/buffer_head.h | 2 ++ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 3b032b9..762168a 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -609,7 +609,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)) @@ -630,6 +630,7 @@ static int __set_page_dirty(struct page *page, return 1; } +EXPORT_SYMBOL(__set_page_dirty); /* * Add a page to the dirty page list. diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 6690269..f2779b8 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 */