diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 09:52:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 09:52:09 -0700 |
| commit | a4dd8dce14014665862ce7911b38cb2c69e366dd (patch) | |
| tree | 00e79b2845d5d49abcd83cf253db83a52d482265 /fs/nfs/Kconfig | |
| parent | b18cae4224bde7e5a332c19bc99247b2098ea232 (diff) | |
| parent | 411b5e05617593efebc06241dbc56f42150f2abe (diff) | |
| download | linux-3.10-a4dd8dce14014665862ce7911b38cb2c69e366dd.tar.gz linux-3.10-a4dd8dce14014665862ce7911b38cb2c69e366dd.tar.bz2 linux-3.10-a4dd8dce14014665862ce7911b38cb2c69e366dd.zip | |
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
net/sunrpc: Use static const char arrays
nfs4: fix channel attribute sanity-checks
NFSv4.1: Use more sensible names for 'initialize_mountpoint'
NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure
NFSv4.1: pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure
NFS: client needs to maintain list of inodes with active layouts
NFS: create and destroy inode's layout cache
NFSv4.1: pnfs: filelayout: introduce minimal file layout driver
NFSv4.1: pnfs: full mount/umount infrastructure
NFS: set layout driver
NFS: ask for layouttypes during v4 fsinfo call
NFS: change stateid to be a union
NFSv4.1: pnfsd, pnfs: protocol level pnfs constants
SUNRPC: define xdr_decode_opaque_fixed
NFSD: remove duplicate NFS4_STATEID_SIZE
Diffstat (limited to 'fs/nfs/Kconfig')
| -rw-r--r-- | fs/nfs/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 5c55c26af16..fd667652c50 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -77,13 +77,17 @@ config NFS_V4 config NFS_V4_1 bool "NFS client support for NFSv4.1 (EXPERIMENTAL)" - depends on NFS_V4 && EXPERIMENTAL + depends on NFS_FS && NFS_V4 && EXPERIMENTAL + select PNFS_FILE_LAYOUT help This option enables support for minor version 1 of the NFSv4 protocol - (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client. + (RFC 5661) in the kernel's NFS client. If unsure, say N. +config PNFS_FILE_LAYOUT + tristate + config ROOT_NFS bool "Root file system on NFS" depends on NFS_FS=y && IP_PNP |