diff options
| author |   J. Bruce Fields <bfields@citi.umich.edu> | 2010-04-15 15:11:09 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-04-16 21:47:37 -0400 |
| commit | 408b79bcc32d7221a4975771ab6bff3d3173d530 (patch) | |
| tree | b39fb803b110f524601693c7faf8f95c94371ef4 /fs/nfsd | |
| parent | nfsd4: remove probe task's reference on client (diff) | |
| download | linux-dev-408b79bcc32d7221a4975771ab6bff3d3173d530.tar.xz linux-dev-408b79bcc32d7221a4975771ab6bff3d3173d530.zip | |
nfsd4: consistent session flag setting
We should clear these flags on any new create_session, not just on the
first one.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5d86df1d1881..5051ade30dfb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1323,12 +1323,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, cs_slot->sl_seqid++; /* from 0 to 1 */ move_to_confirmed(unconf); - /* - * We do not support RDMA or persistent sessions - */ - cr_ses->flags &= ~SESSION4_PERSIST; - cr_ses->flags &= ~SESSION4_RDMA; - if (cr_ses->flags & SESSION4_BACK_CHAN) { unconf->cl_cb_xprt = rqstp->rq_xprt; svc_xprt_get(unconf->cl_cb_xprt); @@ -1348,6 +1342,12 @@ nfsd4_create_session(struct svc_rqst *rqstp, goto out; } + /* + * We do not support RDMA or persistent sessions + */ + cr_ses->flags &= ~SESSION4_PERSIST; + cr_ses->flags &= ~SESSION4_RDMA; + status = alloc_init_session(rqstp, conf, cr_ses); if (status) goto out; |