From: Dan Magenheimer Subject: Cleancache [PATCH 5/7] (was Transcendent Memory): btrfs hooks Date: Thu, 22 Apr 2010 06:29:09 -0700 Message-ID: <20100422132909.GA27349__7420.15833170644$1271943156$gmane$org@ca-server1.us.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: chris.mason@oracle.com, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, adilger@sun.com, tytso@mit.edu, mfasheh@suse.com, joel.becker@oracle.com, matthew@wil.cx, linux-btrfs@vger. Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:33557 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754806Ab0DVNbK (ORCPT ); Thu, 22 Apr 2010 09:31:10 -0400 Content-Disposition: inline Sender: linux-ext4-owner@vger.kernel.org List-ID: (Sorry for resend... Mail server DNS problems sending to some recipients) Cleancache [PATCH 5/7] (was Transcendent Memory): btrfs hooks Filesystems must explicitly enable cleancache. Also, btrfs uses its own readpage which must be hooked. Signed-off-by: Dan Magenheimer Signed-off-by: Chris Mason Diffstat: extent_io.c | 9 +++++++++ super.c | 2 ++ 2 files changed, 11 insertions(+) --- linux-2.6.34-rc5/fs/btrfs/super.c 2010-04-19 17:29:56.000000000 -0600 +++ linux-2.6.34-rc5-cleancache/fs/btrfs/super.c 2010-04-21 10:08:39.000000000 -0600 @@ -39,6 +39,7 @@ #include #include #include +#include #include "compat.h" #include "ctree.h" #include "disk-io.h" @@ -477,6 +478,7 @@ static int btrfs_fill_super(struct super sb->s_root = root_dentry; save_mount_options(sb, data); + sb->cleancache_poolid = cleancache_init_fs(PAGE_SIZE); return 0; fail_close: --- linux-2.6.34-rc5/fs/btrfs/extent_io.c 2010-04-19 17:29:56.000000000 -0600 +++ linux-2.6.34-rc5-cleancache/fs/btrfs/extent_io.c 2010-04-21 10:07:31.000000000 -0600 @@ -10,6 +10,7 @@ #include #include #include +#include #include "extent_io.h" #include "extent_map.h" #include "compat.h" @@ -2030,6 +2031,13 @@ static int __extent_read_full_page(struc set_page_extent_mapped(page); + if (!PageUptodate(page)) { + if (cleancache_get_page(page) == 1) { + BUG_ON(blocksize != PAGE_SIZE); + goto out; + } + } + end = page_end; lock_extent(tree, start, end, GFP_NOFS); @@ -2146,6 +2154,7 @@ static int __extent_read_full_page(struc cur = cur + iosize; page_offset += iosize; } +out: if (!nr) { if (!PageError(page)) SetPageUptodate(page);