diff options
| author | Linus Torvalds | 2009-04-06 22:25:56 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-06 22:25:56 +0200 |
| commit | a63856252d2112e7c452696037a86ceb12f47f80 (patch) | |
| tree | b1ad03fe441349069f80e58de425b3f72af9e5b7 /fs/nfsd/Kconfig | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| parent | nfsd41: define nfsd4_set_statp as noop for !CONFIG_NFSD_V4 (diff) | |
| download | kernel-qcow2-linux-a63856252d2112e7c452696037a86ceb12f47f80.tar.gz kernel-qcow2-linux-a63856252d2112e7c452696037a86ceb12f47f80.tar.xz kernel-qcow2-linux-a63856252d2112e7c452696037a86ceb12f47f80.zip | |
Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux: (81 commits)
nfsd41: define nfsd4_set_statp as noop for !CONFIG_NFSD_V4
nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc
nfsd41: Documentation/filesystems/nfs41-server.txt
nfsd41: CREATE_EXCLUSIVE4_1
nfsd41: SUPPATTR_EXCLCREAT attribute
nfsd41: support for 3-word long attribute bitmask
nfsd: dynamically skip encoded fattr bitmap in _nfsd4_verify
nfsd41: pass writable attrs mask to nfsd4_decode_fattr
nfsd41: provide support for minor version 1 at rpc level
nfsd41: control nfsv4.1 svc via /proc/fs/nfsd/versions
nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap
nfsd41: access_valid
nfsd41: clientid handling
nfsd41: check encode size for sessions maxresponse cached
nfsd41: stateid handling
nfsd: pass nfsd4_compound_state* to nfs4_preprocess_{state,seq}id_op
nfsd41: destroy_session operation
nfsd41: non-page DRC for solo sequence responses
nfsd41: Add a create session replay cache
nfsd41: create_session operation
...
Diffstat (limited to 'fs/nfsd/Kconfig')
| -rw-r--r-- | fs/nfsd/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index 44d7d04dab95..503b9da159a3 100644 --- a/fs/nfsd/Kconfig +++ b/fs/nfsd/Kconfig @@ -1,6 +1,7 @@ config NFSD tristate "NFS server support" depends on INET + depends on FILE_LOCKING select LOCKD select SUNRPC select EXPORTFS |