diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 19:07:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 19:07:44 -0500 |
| commit | 843c04a0f63c74c6424e4b7d1ab85223b1ecf740 (patch) | |
| tree | c7f6b771ccc47a249b3c607471b3fbd1ad7ab7d2 /net | |
| parent | b00ecabf1d00f6c164aee62703df5dae7ac79894 (diff) | |
| parent | fa82a491275a613b15489aab4b99acecb00958d3 (diff) | |
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
nfsd: fix cred leak on every rpc
nfsd: fix null dereference on error path
nfs: note that CONFIG_SUNRPC_XPRT_RDMA turns on server side support too
update port number in NFS/RDMA documentation
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig index eda4a7aee596..dcef600d0bf5 100644 --- a/net/sunrpc/Kconfig +++ b/net/sunrpc/Kconfig | |||
| @@ -9,9 +9,8 @@ config SUNRPC_XPRT_RDMA | |||
| 9 | depends on SUNRPC && INFINIBAND && EXPERIMENTAL | 9 | depends on SUNRPC && INFINIBAND && EXPERIMENTAL |
| 10 | default SUNRPC && INFINIBAND | 10 | default SUNRPC && INFINIBAND |
| 11 | help | 11 | help |
| 12 | This option enables an RPC client transport capability that | 12 | This option allows the NFS client and server to support |
| 13 | allows the NFS client to mount servers via an RDMA-enabled | 13 | an RDMA-enabled transport. |
| 14 | transport. | ||
| 15 | 14 | ||
| 16 | To compile RPC client RDMA transport support as a module, | 15 | To compile RPC client RDMA transport support as a module, |
| 17 | choose M here: the module will be called xprtrdma. | 16 | choose M here: the module will be called xprtrdma. |