summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorJ. Bruce Fields2012-09-11 20:53:09 +0200
committerJ. Bruce Fields2012-10-01 23:39:57 +0200
commitc116a0af76424c72d91ebff7646639cb1287bf63 (patch)
treeb78e4f8f7946729edb5cb8b8b79519ee07f31937 /fs/nfsd/nfs4state.c
parentnfsd4: don't pin clientids to pseudoflavors (diff)
downloadkernel-qcow2-linux-c116a0af76424c72d91ebff7646639cb1287bf63.tar.gz
kernel-qcow2-linux-c116a0af76424c72d91ebff7646639cb1287bf63.tar.xz
kernel-qcow2-linux-c116a0af76424c72d91ebff7646639cb1287bf63.zip
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/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 0f8d7e7922eb..73029cd0c5b6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1667,6 +1667,7 @@ out_new:
status = nfserr_jukebox;
goto out;
}
+ new->cl_minorversion = 1;
gen_clid(new);
add_to_unconfirmed(new, strhashval);
@@ -1799,12 +1800,6 @@ nfsd4_create_session(struct svc_rqst *rqstp,
status = nfserr_stale_clientid;
goto out;
}
-
- /*
- * XXX: we should probably set this at creation time, and check
- * for consistent minorversion use throughout:
- */
- conf->cl_minorversion = 1;
/*
* We do not support RDMA or persistent sessions
*/
@@ -2216,10 +2211,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
copy_clid(new, conf);
else /* case 4 (new client) or cases 2, 3 (client reboot): */
gen_clid(new);
- /*
- * XXX: we should probably set this at creation time, and check
- * for consistent minorversion use throughout:
- */
new->cl_minorversion = 0;
gen_callback(new, setclid, rqstp);
add_to_unconfirmed(new, strhashval);