Commit d29c374c authored by J. Bruce Fields's avatar J. Bruce Fields Committed by J. Bruce Fields

nfsd4: track backchannel connections

We need to keep track of which connections are available for use with
the backchannel, which for the forechannel, and which for both.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 86c3e16c
...@@ -644,7 +644,7 @@ static void nfsd4_conn_lost(struct svc_xpt_user *u) ...@@ -644,7 +644,7 @@ static void nfsd4_conn_lost(struct svc_xpt_user *u)
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
} }
static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp) static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp, u32 flags)
{ {
struct nfsd4_conn *conn; struct nfsd4_conn *conn;
...@@ -653,7 +653,7 @@ static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp) ...@@ -653,7 +653,7 @@ static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp)
return NULL; return NULL;
svc_xprt_get(rqstp->rq_xprt); svc_xprt_get(rqstp->rq_xprt);
conn->cn_xprt = rqstp->rq_xprt; conn->cn_xprt = rqstp->rq_xprt;
conn->cn_flags = NFS4_CDFC4_FORE; conn->cn_flags = flags;
INIT_LIST_HEAD(&conn->cn_xpt_user.list); INIT_LIST_HEAD(&conn->cn_xpt_user.list);
return conn; return conn;
} }
...@@ -682,8 +682,11 @@ static void nfsd4_register_conn(struct nfsd4_conn *conn) ...@@ -682,8 +682,11 @@ static void nfsd4_register_conn(struct nfsd4_conn *conn)
static __be32 nfsd4_new_conn(struct svc_rqst *rqstp, struct nfsd4_session *ses) static __be32 nfsd4_new_conn(struct svc_rqst *rqstp, struct nfsd4_session *ses)
{ {
struct nfsd4_conn *conn; struct nfsd4_conn *conn;
u32 flags = NFS4_CDFC4_FORE;
conn = alloc_conn(rqstp); if (ses->se_flags & SESSION4_BACK_CHAN)
flags |= NFS4_CDFC4_BACK;
conn = alloc_conn(rqstp, flags);
if (!conn) if (!conn)
return nfserr_jukebox; return nfserr_jukebox;
nfsd4_hash_conn(conn, ses); nfsd4_hash_conn(conn, ses);
...@@ -1640,7 +1643,7 @@ static void nfsd4_sequence_check_conn(struct svc_rqst *rqstp, struct nfsd4_sessi ...@@ -1640,7 +1643,7 @@ static void nfsd4_sequence_check_conn(struct svc_rqst *rqstp, struct nfsd4_sessi
if (c) if (c)
return; return;
new = alloc_conn(rqstp); new = alloc_conn(rqstp, NFS4_CDFC4_FORE);
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
c = __nfsd4_find_conn(rqstp, ses); c = __nfsd4_find_conn(rqstp, ses);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment