Maverick pull request, LP440522, enable FSCACHE_HISTOGRAM, FSCACHE_STATS, NFS_FSCACHE

[Tim Gardner]

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 <tim.gardner at canonical.com>
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 <tim.gardner at canonical.com>
---
 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 <tim.gardner at canonical.com>
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 <tim.gardner at canonical.com>
---
 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
-- 
1.7.0.4