diff ../linux/fs/Kconfig fs/Kconfig
205,215d204
< config EXT4DEV_FS_NO_PANIC
< bool "Ext4dev no panic in mount error"
< depends on EXT4DEV_FS
< default y
< help
< An Ext4dev filesystem can be configured to cause a kernel panic when
< a mount error occurs.
<
< This behaviour is only useful in some rare cases, so most people
< would want to say Y here.
<
288,289d276
< source "fs/reiser4/Kconfig"
<
1044,1080d1030
< config ECRYPT_FS
< tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
< depends on EXPERIMENTAL && KEYS && CRYPTO && NET
< help
< Encrypted filesystem that operates on the VFS layer. See
< <file:Documentation/filesystems/ecryptfs.txt> to learn more about
< eCryptfs. Userspace components are required and can be
< obtained from <
http://ecryptfs.sf.net>.
<
< To compile this file system support as a module, choose M here: the
< module will be called ecryptfs.
<
< config UNION_FS
< tristate "Union file system (EXPERIMENTAL)"
< depends on EXPERIMENTAL
< help
< Unionfs is a stackable unification file system, which appears to
< merge the contents of several directories (branches), while keeping
< their physical content separate.
<
< See <
http://unionfs.filesystems.org> for details
<
< config UNION_FS_XATTR
< bool "Unionfs extended attributes"
< depends on UNION_FS
< help
< Extended attributes are name:value pairs associated with inodes by
< the kernel or by users (see the attr(5) manual page).
<
< If unsure, say N.
<
< config UNION_FS_DEBUG
< bool "Debug Unionfs"
< depends on UNION_FS
< help
< If you say Y here, you can turn on debugging output from Unionfs.
<
1134a1085,1096
> config ECRYPT_FS
> tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
> depends on EXPERIMENTAL && KEYS && CRYPTO && NET
> help
> Encrypted filesystem that operates on the VFS layer. See
> <file:Documentation/filesystems/ecryptfs.txt> to learn more about
> eCryptfs. Userspace components are required and can be
> obtained from <
http://ecryptfs.sf.net>.
>
> To compile this file system support as a module, choose M here: the
> module will be called ecryptfs.
>
2250,2271d2211
< config DEFAULT_RELATIME
< bool "Mount all filesystems with relatime by default"
< default y
< help
< If you say Y here, all your filesystems will be mounted
< with the "relatime" mount option. This eliminates many atime
< ('file last accessed' timestamp) updates (which otherwise
< is performed on every file access and generates a write
< IO to the inode) and thus speeds up IO. Atime is still updated,
< but only once per day.
<
< The mtime ('file last modified') and ctime ('file created')
< timestamp are unaffected by this change.
<
< Use the "norelatime" kernel boot option to turn off this
< feature.
<
< config DEFAULT_RELATIME_VAL
< int
< default "1" if DEFAULT_RELATIME
< default "0"
<