From patchwork Fri May 28 17:36:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Magenheimer X-Patchwork-Id: 102936 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4SHdnbJ030063 for ; Fri, 28 May 2010 17:39:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945Ab0E1Ri0 (ORCPT ); Fri, 28 May 2010 13:38:26 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:55691 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758952Ab0E1RiW (ORCPT ); Fri, 28 May 2010 13:38:22 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o4SHbSD5005424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 May 2010 17:37:29 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o4SApBTs008740; Fri, 28 May 2010 17:37:26 GMT Received: from ca-server1.us.oracle.com by acsmt355.oracle.com with ESMTP id 278047631275068212; Fri, 28 May 2010 10:36:52 -0700 Received: from dmagenhe by ca-server1.us.oracle.com with local (Exim 4.69) (envelope-from ) id 1OI3UJ-0005EG-5j; Fri, 28 May 2010 10:36:51 -0700 Date: Fri, 28 May 2010 10:36:51 -0700 From: Dan Magenheimer 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.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-mm@kvack.org, ngupta@vflare.org, jeremy@goop.org, JBeulich@novell.com, kurt.hackel@oracle.com, npiggin@suse.de, dave.mccracken@oracle.com, riel@redhat.com, avi@redhat.com, konrad.wilk@oracle.com, dan.magenheimer@oracle.com Subject: [PATCH V2 5/7] Cleancache (was Transcendent Memory): btrfs hooks Message-ID: <20100528173651.GA20098@ca-server1.us.oracle.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-11) X-Auth-Type: Internal IP X-Source-IP: acsinet15.oracle.com [141.146.126.227] X-CT-RefId: str=0001.0A090208.4BFFFF5B.0005:SCFMA922111,ss=1,fgs=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 28 May 2010 17:39:49 +0000 (UTC) --- linux-2.6.34/fs/btrfs/super.c 2010-05-16 15:17:36.000000000 -0600 +++ linux-2.6.34-cleancache/fs/btrfs/super.c 2010-05-24 12:14:44.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/fs/btrfs/extent_io.c 2010-05-16 15:17:36.000000000 -0600 +++ linux-2.6.34-cleancache/fs/btrfs/extent_io.c 2010-05-24 12:31:01.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) == CLEANCACHE_GET_PAGE_SUCCESS) { + 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);