--- Kconfig.in 2007-12-05 08:04:33.000000000 -0500 +++ Kconfig 2007-12-05 08:14:51.000000000 -0500 @@ -19,7 +19,6 @@ See Unionfs for the basic features. if AUFS -comment "These options are for "#UTS_RELEASE config AUFS_FAKE_DM bool "Use simplified (fake) nameidata" @@ -40,24 +39,16 @@ depends on AUFS default AUFS_BRANCH_MAX_127 help - HELP + Specifies the maximum number of branches (or member directories) in a single aufs. The larger value consumes more system resources and has an impact to performance. config AUFS_BRANCH_MAX_127 bool "127" - help - HELP config AUFS_BRANCH_MAX_511 bool "511" - help - HELP config AUFS_BRANCH_MAX_1023 bool "1023" - help - HELP /* 128kb is available for kmalloc? */ config AUFS_BRANCH_MAX_32767 bool "32767" - help - HELP endchoice #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) @@ -73,8 +64,6 @@ /proc/mount, you need to enable this option and set aufs module parameter brs=1. See detail in aufs.5. -comment "SYSAUFS and AUFS_SYSAUFS are disabled" - depends on SYSFS = n #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) @@ -89,28 +78,23 @@ option and use 'udba=inotify' mount option. It will damage the performance. See detail in aufs.5. - -comment "INOTIFY and AUFS_HINOTIFY are disabled" - depends on INOTIFY = n #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) config AUFS_EXPORT bool "NFS-exportable aufs" - depends on AUFS depends on (AUFS = y && EXPORTFS = y) || (AUFS = m && EXPORTFS) + depends on AUFS_FAKE_DM = n default n help If you want to export your mounted aufs, then enable this option. There are several requirements to export aufs. See detail in aufs.5. - -comment "EXPORTFS and AUFS_EXPORT are disabled" - depends on AUFS - depends on EXPORTFS = n - -comment "AUFS_EXPORT is disabled since EXPORTFS is a module but AUFS" - depends on AUFS +comment "Change AUFS_FAKE_DM=n to export AUFS over NFS" + depends on AUFS_EXPORT = n + depends on AUFS_FAKE_DM = y +comment "Change AUFS=m, or EXPORTFS=y to export AUFS over NFS" + depends on AUFS_EXPORT = n depends on EXPORTFS = m && AUFS = y #endif @@ -139,9 +123,6 @@ 'dlgt' mount option. It will damage the performance. See detail in aufs.5. - -#if 1 -/* this is not in mainstream kernel */ config AUFS_RR_SQUASHFS bool "Make squashfs branch RR (real readonly) by default" depends on AUFS @@ -153,101 +134,47 @@ 'rr' stands for real readonly and it optimizes some aspects of 'ro.' See detail in aufs.5. -#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) config AUFS_SEC_PERM_PATCH - bool "sec_perm-2.6.24.patch was applied or not" - depends on AUFS + bool depends on AUFS = m depends on SECURITY - default n - help - If you build aufs as a module and enabled CONFIG_SECURITY, - then you need to apply the patch - 'CVS_TREE/aufs/patch/sec_perm-2.6.24.patch' to your kernel - source, and enable this configuration. - The sec_perm-2.6.24.patch exports a kernel function - security_inode_permission() to modules. - -comment "SECURITY and AUFS_SEC_PERM_PATCH are disabled" - depends on AUFS - depends on SECURITY = n + default y #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) config AUFS_SPLICE_PATCH - bool "splice.patch for sendfile(2) and splice(2)" + bool depends on AUFS - default n - help - If you use 'loopback mount' on a fs-image file, or use - splice(2) systemcall in aufs, then you need to apply the patch - 'CVS_TREE/aufs/patch/splice.patch' to your kernel source, and - enable this configuration. - The splice.patch makes the kernel function do_splice_to/from() - global and exports them to modules. + default y #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) config AUFS_PUT_FILP_PATCH - bool "put_filp.patch for NFS branch" - depends on AUFS + bool depends on AUFS = m + depends on AUFS_EXPORT depends on NFS_FS - default n - help - If you build aufs as a module and use mounted NFS as an aufs - branch filesystem, then you need to apply the patch - 'CVS_TREE/aufs/patch/put_filp.patch' to your kernel source, - and enable this configuration. - The put_filp.patch exports a kernel function put_filp() to - modules. - -comment "NFS_FS and AUFS_PUT_FILP_PATCH are disabled" - depends on AUFS - depends on NFS_FS = n - + default y config AUFS_LHASH_PATCH - bool "lhash.patch for NFS branch" - depends on AUFS + bool + depends on AUFS_EXPORT depends on NFS_FS - default n - help - If you use mounted NFS as an aufs branch filesystem, then you - need to apply the patch 'CVS_TREE/aufs/patch/lhash.patch' (or - lhash-2.6.22.patch for linux-2.6.22 and later) to your kernel - source, and enable this configuration. - The patch file makes the kernel function __lookup_hash() global - and exports it to modules. - -comment "NFS_FS and AUFS_LHASH_PATCH are disabled" - depends on AUFS - depends on NFS_FS = n + default y #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) config AUFS_DENY_WRITE_ACCESS_PATCH - bool "deny_write_access.patch was applied or not" - depends on AUFS + bool depends on AUFS = m - default n - help - A security enhancement to deny writing to a running executable - which exists on an aufs branch filesystem and executed through - aufs. If you applied - 'CVS_TREE/aufs/patch/deny_write_access.patch' to your kernel - and you are compiling aufs as a module, then enable this - option. - The write_deny_access.patch does nothing but export the - function. + default y #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) config AUFS_SYSFS_GET_DENTRY_PATCH - bool "sysfs_get_dentry.patch for /sys/fs/aufs" - depends on AUFS - depends on SYSFS + bool "Show the amount of kernel memory allocated in /sys/fs/aufs" + depends on AUFS_SYSAUFS default n help This configuration and the patch @@ -267,17 +194,9 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) \ && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) config AUFS_KSIZE_PATCH - bool "ksize.patch was applied or not" - depends on AUFS + bool depends on AUFS = m default n - help - Aufs sometimes needs to re-allocate memory. If 'ksize' kernel internal - function is exported to modules, aufs runs efficiently in some cases. - If you applied 'CVS_TREE/aufs/patch/ksize.patch' to your - kernel and you are compiling aufs as a module, then enable - this option. - The ksize.patch does nothing but export the function. #endif config AUFS_WORKAROUND_FUSE @@ -298,15 +217,13 @@ filesystem branch. It will damage the performance even if you don't use a FUSE-based filesystem branch. - config AUFS_DEBUG bool "Debug aufs" depends on AUFS - default y + default n help Enable this to compile aufs internal debug code. The performance will be damaged. - config AUFS_COMPAT bool "Compatibility with Unionfs (obsolete)" depends on AUFS