From patchwork Tue Jun 15 21:46:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 55801 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 25A18B7D86 for ; Wed, 16 Jun 2010 07:47:10 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OOdyL-0007oI-4z; Tue, 15 Jun 2010 22:47:05 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OOdyI-0007mN-0m for kernel-team@lists.ubuntu.com; Tue, 15 Jun 2010 22:47:03 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 8C4C923B1B1; Tue, 15 Jun 2010 14:46:10 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id 3C1EAF88CE; Tue, 15 Jun 2010 15:46:57 -0600 (MDT) To: leann@canonical.com Subject: Maverick pull request, LP440522, enable FSCACHE_HISTOGRAM, FSCACHE_STATS, NFS_FSCACHE Message-Id: <20100615214657.3C1EAF88CE@sepang.rtg.net> Date: Tue, 15 Jun 2010 15:46:57 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 929f393f76d2037905ebcea77247b43a6fe6b9d8: Leann Ogasawara (1): UBUNTU: Ubuntu-2.6.35-3.4 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-maverick.git lp440522-NFS-FSCACHE Tim Gardner (2): UBUNTU: [Config] CONFIG_NFS_FSCACHE=y UBUNTU: [Config] CONFIG_FSCACHE_STATS=y, CONFIG_FSCACHE_HISTOGRAM=y debian.master/config/config.common.ports | 6 +++--- debian.master/config/config.common.ubuntu | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) From fd3f8cda0c5279082f21f7ac11ab732dcbd73a6d Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 15 Jun 2010 15:04:06 -0600 Subject: [PATCH 1/2] UBUNTU: [Config] CONFIG_NFS_FSCACHE=y BugLink: http://bugs.launchpad.net/bugs/440522 This feature is no longer marked experimental. Signed-off-by: Tim Gardner --- debian.master/config/config.common.ports | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index c4fcb68..0b9ded9 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -2328,7 +2328,7 @@ CONFIG_NFSD_V4=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_NFS_FS=m -# CONFIG_NFS_FSCACHE is not set +CONFIG_NFS_FSCACHE=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1b46e3c..e9333f0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2918,7 +2918,7 @@ CONFIG_NFSD_V4=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_NFS_FS=m -# CONFIG_NFS_FSCACHE is not set +CONFIG_NFS_FSCACHE=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -- 1.7.0.4 From aa9587d64b117784918b5163aba8981e48429589 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 15 Jun 2010 15:09:00 -0600 Subject: [PATCH 2/2] UBUNTU: [Config] CONFIG_FSCACHE_STATS=y, CONFIG_FSCACHE_HISTOGRAM=y BugLink: http://bugs.launchpad.net/bugs/440522 Collect some statistics about file system caching. Use of the fscache module is elective, so you don't take the minor performance hit unless you install the fscache module. Signed-off-by: Tim Gardner --- debian.master/config/config.common.ports | 4 ++-- debian.master/config/config.common.ubuntu | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 0b9ded9..f0ab6b7 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1063,9 +1063,9 @@ CONFIG_FREEZER=y # CONFIG_FSAM7400 is not set CONFIG_FSCACHE=m # CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_HISTOGRAM is not set +CONFIG_FSCACHE_HISTOGRAM=y # CONFIG_FSCACHE_OBJECT_LIST is not set -# CONFIG_FSCACHE_STATS is not set +CONFIG_FSCACHE_STATS=y # CONFIG_FSL_ULI1575 is not set CONFIG_FSNOTIFY=y CONFIG_FS_MBCACHE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e9333f0..364eda8 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1433,9 +1433,9 @@ CONFIG_FRAME_WARN=1024 CONFIG_FREEZER=y CONFIG_FSCACHE=m # CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_HISTOGRAM is not set +CONFIG_FSCACHE_HISTOGRAM=y # CONFIG_FSCACHE_OBJECT_LIST is not set -# CONFIG_FSCACHE_STATS is not set +CONFIG_FSCACHE_STATS=y CONFIG_FSNOTIFY=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y