From 97d6292deb30ea6a4ab963efc68514442ece4594 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 9 Jan 2013 16:11:16 +0100 Subject: [PATCH] linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2 and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could probably be enabled for earlier kernels too. --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.3.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.5.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.6.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.7.nix | 2 ++ 6 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 212a86f36a3..aded11706d1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -146,8 +146,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 0db9a5c375d..b3660afaabb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -146,8 +146,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index a03e3950891..34c634f5e92 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 78f60c9906a..c5d694cfc5a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 3fb47da7be6..3447c9968e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 1a02910b5c8..57699961f7c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem