From patchwork Fri Jul 27 10:27:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sha Zhengju X-Patchwork-Id: 1248101 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 030BADFFC0 for ; Fri, 27 Jul 2012 10:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764Ab2G0K1V (ORCPT ); Fri, 27 Jul 2012 06:27:21 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:62120 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752996Ab2G0K1T (ORCPT ); Fri, 27 Jul 2012 06:27:19 -0400 Received: by pbbrp8 with SMTP id rp8so4792470pbb.19 for ; Fri, 27 Jul 2012 03:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8ewitbPAtxx4ugzRXe4kW86VkqIXb61Mb4SsJwKH6HA=; b=XWHTpHTkjQKcqoZ9kOtV46kWzhYxrzLscIq7W/AX+MrZVQCHb+kxgFkfMs2Wha2oPR oNnWMPsHWi+eFUvtEn8RK9cKD9UUGzdS5pSx+wXNdV7V64+Ra8P9UJ5unFmWQTz5FE+2 WAzHInlyyXW1d5aTRLugsecy+ZZUtJyiv9ZZ37j0zkj2EdTi1n2DaS/Nv4Y1cZMTXVt1 gUlNPztwUXqiMx3/la3sXCFZa0qZ782hGgAl8pt5+aEcWimQaKdWoD1wuSvEtLQzxofn xCelh6AsFUeYdf6MLgBbi0ybe1qHnsTmtmm1WnUjm5Kp5hrd3ey1F8rKmOm+/s+2aydk Q6Ug== Received: by 10.68.192.40 with SMTP id hd8mr12842624pbc.125.1343384838764; Fri, 27 Jul 2012 03:27:18 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id kh1sm1666927pbc.23.2012.07.27.03.27.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 03:27:18 -0700 (PDT) From: Sha Zhengju To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: fengguang.wu@intel.com, gthelen@google.com, akpm@linux-foundation.org, yinghan@google.com, mhocko@suse.cz, linux-kernel@vger.kernel.org, hannes@cmpxchg.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 V2 3/6] Use vfs __set_page_dirty interface instead of doing it inside filesystem Date: Fri, 27 Jul 2012 18:27:05 +0800 Message-Id: <1343384825-20127-1-git-send-email-handai.szj@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1343384432-19903-1-git-send-email-handai.szj@taobao.com> References: <1343384432-19903-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 --- 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 5e0b0d2..ffcfb87 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)) @@ -631,6 +631,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 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 */