diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-14 17:49:37 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-21 10:11:50 -0400 |
commit | 90c8145bb6fe1d9e0a808de6a701748967588bbd (patch) | |
tree | 49a1b74340f8369b3d77c705cf5b5f93f44f74b3 /fs/nfsd/nfs4state.c | |
parent | edd76786633a3145661c7a90c9baccae8e3c9e84 (diff) |
nfsd4: use client pointer to backchannel session
Instead of copying the sessionid, use the new cl_cb_session pointer,
which indicates which session we're using for the backchannel.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index db5d8c8537ed..c942511f73e6 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -753,8 +753,6 @@ static __be32 alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp | |||
753 | 753 | ||
754 | new->se_client = clp; | 754 | new->se_client = clp; |
755 | gen_sessionid(new); | 755 | gen_sessionid(new); |
756 | memcpy(clp->cl_sessionid.data, new->se_sessionid.data, | ||
757 | NFS4_MAX_SESSIONID_LEN); | ||
758 | 756 | ||
759 | INIT_LIST_HEAD(&new->se_conns); | 757 | INIT_LIST_HEAD(&new->se_conns); |
760 | 758 | ||
@@ -1544,7 +1542,7 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
1544 | if (status) | 1542 | if (status) |
1545 | goto out; | 1543 | goto out; |
1546 | 1544 | ||
1547 | memcpy(cr_ses->sessionid.data, conf->cl_sessionid.data, | 1545 | memcpy(cr_ses->sessionid.data, conf->cl_cb_session->se_sessionid.data, |
1548 | NFS4_MAX_SESSIONID_LEN); | 1546 | NFS4_MAX_SESSIONID_LEN); |
1549 | cr_ses->seqid = cs_slot->sl_seqid; | 1547 | cr_ses->seqid = cs_slot->sl_seqid; |
1550 | 1548 | ||