diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-10-19 17:31:50 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-21 10:11:54 -0400 |
| commit | 8b5ce5cd44743af84507721fa2cb4125ae67955c (patch) | |
| tree | 24a1fa7191204140283803c17780dc4bb4066bba /fs/nfsd/nfs4state.c | |
| parent | d29c374cd20de620898d2936396048518809ae24 (diff) | |
| download | kernel_samsung_aries-8b5ce5cd44743af84507721fa2cb4125ae67955c.zip kernel_samsung_aries-8b5ce5cd44743af84507721fa2cb4125ae67955c.tar.gz kernel_samsung_aries-8b5ce5cd44743af84507721fa2cb4125ae67955c.tar.bz2 | |
nfsd4: callback program number is per-session
The callback program is allowed to depend on the session which the
callback is going over.
No change in behavior yet, while we still only do callbacks over a
single session for the lifetime of the client.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c470cb7..59bc001 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -760,6 +760,7 @@ static struct nfsd4_session *alloc_init_session(struct svc_rqst *rqstp, struct n new->se_cb_seq_nr = 1; new->se_flags = cses->flags; + new->se_cb_prog = cses->callback_prog; kref_init(&new->se_ref); idx = hash_sessionid(&new->se_sessionid); spin_lock(&client_lock); @@ -782,7 +783,6 @@ static struct nfsd4_session *alloc_init_session(struct svc_rqst *rqstp, struct n rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); clp->cl_cb_conn.cb_minorversion = 1; - clp->cl_cb_conn.cb_prog = cses->callback_prog; nfsd4_probe_callback(clp, &clp->cl_cb_conn); } return new; |