From patchwork Thu Apr 22 13:29:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Magenheimer X-Patchwork-Id: 94111 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 o3MDWZW0007913 for ; Thu, 22 Apr 2010 13:32:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755014Ab0DVNbR (ORCPT ); Thu, 22 Apr 2010 09:31:17 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:33725 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754989Ab0DVNbO (ORCPT ); Thu, 22 Apr 2010 09:31:14 -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 o3MDUlJm014177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 22 Apr 2010 13:30:49 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o3MAmRdj000641; Thu, 22 Apr 2010 13:30:43 GMT Received: from ca-server1.us.oracle.com by acsmt353.oracle.com with ESMTP id 181130661271942991; Thu, 22 Apr 2010 06:29:51 -0700 Received: from dmagenhe by ca-server1.us.oracle.com with local (Exim 4.69) (envelope-from ) id 1O4wTV-00077y-U9; Thu, 22 Apr 2010 06:29:49 -0700 Date: Thu, 22 Apr 2010 06:29:49 -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 Subject: Cleancache [PATCH 7/7] (was Transcendent Memory): ocfs2 hook Message-ID: <20100422132949.GA27396@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.4BD04F8B.0013: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]); Thu, 22 Apr 2010 13:32:36 +0000 (UTC) --- linux-2.6.34-rc5/fs/ocfs2/super.c 2010-04-19 17:29:56.000000000 -0600 +++ linux-2.6.34-rc5-cleancache/fs/ocfs2/super.c 2010-04-21 10:13:13.000000000 -0600 @@ -42,6 +42,7 @@ #include #include #include +#include #define MLOG_MASK_PREFIX ML_SUPER #include @@ -2233,6 +2234,8 @@ static int ocfs2_initialize_super(struct mlog_errno(status); goto bail; } + sb->cleancache_poolid = + cleancache_init_shared_fs((char *)&uuid_net_key, PAGE_SIZE); bail: mlog_exit(status);