diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 12:52:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 12:52:09 -0400 |
commit | a4dd8dce14014665862ce7911b38cb2c69e366dd (patch) | |
tree | 00e79b2845d5d49abcd83cf253db83a52d482265 /fs/nfs/Kconfig | |
parent | b18cae4224bde7e5a332c19bc99247b2098ea232 (diff) | |
parent | 411b5e05617593efebc06241dbc56f42150f2abe (diff) |
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 5c55c26af165..fd667652c502 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig | |||
@@ -77,13 +77,17 @@ config NFS_V4 | |||
77 | 77 | ||
78 | config NFS_V4_1 | 78 | config NFS_V4_1 |
79 | bool "NFS client support for NFSv4.1 (EXPERIMENTAL)" | 79 | bool "NFS client support for NFSv4.1 (EXPERIMENTAL)" |
80 | depends on NFS_V4 && EXPERIMENTAL | 80 | depends on NFS_FS && NFS_V4 && EXPERIMENTAL |
81 | select PNFS_FILE_LAYOUT | ||
81 | help | 82 | help |
82 | This option enables support for minor version 1 of the NFSv4 protocol | 83 | This option enables support for minor version 1 of the NFSv4 protocol |
83 | (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client. | 84 | (RFC 5661) in the kernel's NFS client. |
84 | 85 | ||
85 | If unsure, say N. | 86 | If unsure, say N. |
86 | 87 | ||
88 | config PNFS_FILE_LAYOUT | ||
89 | tristate | ||
90 | |||
87 | config ROOT_NFS | 91 | config ROOT_NFS |
88 | bool "Root file system on NFS" | 92 | bool "Root file system on NFS" |
89 | depends on NFS_FS=y && IP_PNP | 93 | depends on NFS_FS=y && IP_PNP |