summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-05-14 09:47:11 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-05-31 20:29:53 -0400
commit2dbb269dfed9e8653be81d49e8f109a243bea25c (patch)
treec9102bb541e4b7e21a0b78bbc61b739e4ac4abb4 /fs/nfsd
parent83e08fd46cea3b59dce9285461e3854b594042af (diff)
nfsd4: exchange_id cleanup: comments
Make these comments a bit more concise and uniform. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c36
1 files changed, 10 insertions, 26 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3b6d61008673..93fcf53daee1 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1550,6 +1550,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
strhashval = clientstr_hashval(dname);
+ /* Cases below refer to rfc 5661 section 18.35.4: */
nfs4_lock_state();
conf = find_confirmed_client_by_str(dname, strhashval);
if (conf) {
@@ -1557,26 +1558,24 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
bool verfs_match = same_verf(&verf, &conf->cl_verifier);
if (!clp_used_exchangeid(conf)) {
- if (update) {
- status = nfserr_inval; /* buggy client */
+ if (update) { /* buggy client */
+ status = nfserr_inval;
goto out;
}
}
- if (!creds_match) {
- /* 18.35.4 case 9 */
+ if (!creds_match) { /* case 9 */
if (update)
status = nfserr_perm;
else /* case 3 */
status = nfserr_clid_inuse;
goto out;
}
- if (!verfs_match) {
- /* 18.35.4 case 8 */
+ if (!verfs_match) { /* case 8 */
if (update) {
status = nfserr_not_same;
goto out;
}
- /* Client reboot: destroy old state */
+ /* case 5, client reboot */
expire_client(conf);
goto out_new;
}
@@ -1584,38 +1583,23 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
status = nfserr_inval;
goto out;
}
- /*
- * Set bit when the owner id and verifier map to an already
- * confirmed client id (18.35.3).
- */
+ /* case 2 */
exid->flags |= EXCHGID4_FLAG_CONFIRMED_R;
-
- /*
- * Falling into 18.35.4 case 2, possible router replay.
- * Leave confirmed record intact and return same result.
- */
new = conf;
goto out_copy;
}
- /* 18.35.4 case 7 */
- if (update) {
+ if (update) { /* case 7 */
status = nfserr_noent;
goto out;
}
unconf = find_unconfirmed_client_by_str(dname, strhashval);
- if (unconf) {
- /*
- * Possible retry or client restart. Per 18.35.4 case 4,
- * a new unconfirmed record should be generated regardless
- * of whether any properties have changed.
- */
+ if (unconf) /* case 4, possible retry or client restart */
expire_client(unconf);
- }
+ /* case 1 (normal case) */
out_new:
- /* Normal case */
new = create_client(exid->clname, dname, rqstp, &verf);
if (new == NULL) {
status = nfserr_jukebox;