diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-09-11 14:53:09 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-10-01 17:39:57 -0400 |
commit | c116a0af76424c72d91ebff7646639cb1287bf63 (patch) | |
tree | b78e4f8f7946729edb5cb8b8b79519ee07f31937 /fs/nfsd | |
parent | 68eb35081e297b37db49d854cda144c6a3397699 (diff) |
nfsd4: set cl_minorversion at create time
And remove some mostly obsolete comments.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0f8d7e7922e..73029cd0c5b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1667,6 +1667,7 @@ out_new: | |||
1667 | status = nfserr_jukebox; | 1667 | status = nfserr_jukebox; |
1668 | goto out; | 1668 | goto out; |
1669 | } | 1669 | } |
1670 | new->cl_minorversion = 1; | ||
1670 | 1671 | ||
1671 | gen_clid(new); | 1672 | gen_clid(new); |
1672 | add_to_unconfirmed(new, strhashval); | 1673 | add_to_unconfirmed(new, strhashval); |
@@ -1799,12 +1800,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
1799 | status = nfserr_stale_clientid; | 1800 | status = nfserr_stale_clientid; |
1800 | goto out; | 1801 | goto out; |
1801 | } | 1802 | } |
1802 | |||
1803 | /* | ||
1804 | * XXX: we should probably set this at creation time, and check | ||
1805 | * for consistent minorversion use throughout: | ||
1806 | */ | ||
1807 | conf->cl_minorversion = 1; | ||
1808 | /* | 1803 | /* |
1809 | * We do not support RDMA or persistent sessions | 1804 | * We do not support RDMA or persistent sessions |
1810 | */ | 1805 | */ |
@@ -2216,10 +2211,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2216 | copy_clid(new, conf); | 2211 | copy_clid(new, conf); |
2217 | else /* case 4 (new client) or cases 2, 3 (client reboot): */ | 2212 | else /* case 4 (new client) or cases 2, 3 (client reboot): */ |
2218 | gen_clid(new); | 2213 | gen_clid(new); |
2219 | /* | ||
2220 | * XXX: we should probably set this at creation time, and check | ||
2221 | * for consistent minorversion use throughout: | ||
2222 | */ | ||
2223 | new->cl_minorversion = 0; | 2214 | new->cl_minorversion = 0; |
2224 | gen_callback(new, setclid, rqstp); | 2215 | gen_callback(new, setclid, rqstp); |
2225 | add_to_unconfirmed(new, strhashval); | 2216 | add_to_unconfirmed(new, strhashval); |