aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2016-03-01 13:05:27 -0500
committerJ. Bruce Fields <bfields@redhat.com>2016-03-01 16:06:32 -0500
commit4ce85c8cf8a8ecfff932642cf20677d7efc90ad3 (patch)
treed34d4028bebcf0f0dec7b65240e01581571f92b9
parent8edf4b028818336ccff7dff5ef60b3d81fac5380 (diff)
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>
-rw-r--r--fs/nfsd/nfs4state.c5
-rw-r--r--fs/nfsd/nfs4xdr.c2
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,
2711 goto out_free_conn; 2711 goto out_free_conn;
2712 } 2712 }
2713 status = nfs_ok; 2713 status = nfs_ok;
2714 /* 2714 /* Persistent sessions are not supported */
2715 * We do not support RDMA or persistent sessions
2716 */
2717 cr_ses->flags &= ~SESSION4_PERSIST; 2715 cr_ses->flags &= ~SESSION4_PERSIST;
2716 /* Upshifting from TCP to RDMA is not supported */
2718 cr_ses->flags &= ~SESSION4_RDMA; 2717 cr_ses->flags &= ~SESSION4_RDMA;
2719 2718
2720 init_session(rqstp, new, conf, cr_ses); 2719 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,
3063 p = xdr_encode_opaque_fixed(p, bcts->sessionid.data, 3063 p = xdr_encode_opaque_fixed(p, bcts->sessionid.data,
3064 NFS4_MAX_SESSIONID_LEN); 3064 NFS4_MAX_SESSIONID_LEN);
3065 *p++ = cpu_to_be32(bcts->dir); 3065 *p++ = cpu_to_be32(bcts->dir);
3066 /* Sorry, we do not yet support RDMA over 4.1: */ 3066 /* Upshifting from TCP to RDMA is not supported */
3067 *p++ = cpu_to_be32(0); 3067 *p++ = cpu_to_be32(0);
3068 } 3068 }
3069 return nfserr; 3069 return nfserr;