diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2016-03-01 13:05:27 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-03-01 13:06:32 -0800 |
| commit | 4ce85c8cf8a8ecfff932642cf20677d7efc90ad3 (patch) | |
| tree | d34d4028bebcf0f0dec7b65240e01581571f92b9 /fs/nfsd | |
| parent | 8edf4b028818336ccff7dff5ef60b3d81fac5380 (diff) | |
| download | linux-stable-4ce85c8cf8a8ecfff932642cf20677d7efc90ad3.tar.gz linux-stable-4ce85c8cf8a8ecfff932642cf20677d7efc90ad3.tar.bz2 linux-stable-4ce85c8cf8a8ecfff932642cf20677d7efc90ad3.zip | |
nfsd: Update NFS server comments related to RDMA support
The server does indeed now support NFSv4.1 on RDMA transports. It
does not support shifting an RDMA-capable TCP transport (such as
iWARP) to RDMA mode.
Reported-by: Shirley Ma <shirley.ma@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 5 | ||||
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9d20c6a54734..d4b0b789ea24 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2711,10 +2711,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, goto out_free_conn; } status = nfs_ok; - /* - * We do not support RDMA or persistent sessions - */ + /* Persistent sessions are not supported */ cr_ses->flags &= ~SESSION4_PERSIST; + /* Upshifting from TCP to RDMA is not supported */ cr_ses->flags &= ~SESSION4_RDMA; init_session(rqstp, new, conf, cr_ses); diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1600ec470ce7..aa87954b4af2 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3063,7 +3063,7 @@ static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp, p = xdr_encode_opaque_fixed(p, bcts->sessionid.data, NFS4_MAX_SESSIONID_LEN); *p++ = cpu_to_be32(bcts->dir); - /* Sorry, we do not yet support RDMA over 4.1: */ + /* Upshifting from TCP to RDMA is not supported */ *p++ = cpu_to_be32(0); } return nfserr; |