From patchwork Mon Aug 30 22:34:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Magenheimer X-Patchwork-Id: 143801 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7UMbBfF029973 for ; Mon, 30 Aug 2010 22:37:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756080Ab0H3Wg3 (ORCPT ); Mon, 30 Aug 2010 18:36:29 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:58621 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755607Ab0H3Wg1 (ORCPT ); Mon, 30 Aug 2010 18:36:27 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o7UMZRtQ013540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Aug 2010 22:35:28 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 o7UMAcVY008786; Mon, 30 Aug 2010 22:35:26 GMT Received: from ca-server1.us.oracle.com by acsmt355.oracle.com with ESMTP id 546411301283207645; Mon, 30 Aug 2010 15:34:05 -0700 Received: from dmagenhe by ca-server1.us.oracle.com with local (Exim 4.69) (envelope-from ) id 1OqCvU-0000MN-9z; Mon, 30 Aug 2010 15:34:04 -0700 Date: Mon, 30 Aug 2010 15:34:04 -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@kernel.dk, dave.mccracken@oracle.com, riel@redhat.com, avi@redhat.com, konrad.wilk@oracle.com, dan.magenheimer@oracle.com, mel@csn.ul.ie, yinghan@google.com, gthelen@google.com Subject: [PATCH V4 8/8] Cleancache: ocfs2 hook for cleancache Message-ID: <20100830223404.GA1381@ca-server1.us.oracle.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-11) 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 (demeter1.kernel.org [140.211.167.41]); Mon, 30 Aug 2010 22:37:11 +0000 (UTC) --- linux-2.6.36-rc3/fs/ocfs2/super.c 2010-08-29 09:36:04.000000000 -0600 +++ linux-2.6.36-rc3-cleancache/fs/ocfs2/super.c 2010-08-30 09:20:43.000000000 -0600 @@ -42,6 +42,7 @@ #include #include #include +#include #define MLOG_MASK_PREFIX ML_SUPER #include @@ -2284,6 +2285,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);