aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeilBrown <neilb@cse.unsw.edu.au>2005-06-23 22:04:06 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 00:06:33 -0700
commit31f4a6c127f619886bf97f643e546f7788248f3f (patch)
tree5c473562ea9051e42a53631f26486959d43fcaa4 /fs/nfsd
parentfd39ca9a808c6026989bc2188868a0574eb37108 (diff)
downloadkernel_samsung_smdk4412-31f4a6c127f619886bf97f643e546f7788248f3f.zip
kernel_samsung_smdk4412-31f4a6c127f619886bf97f643e546f7788248f3f.tar.gz
kernel_samsung_smdk4412-31f4a6c127f619886bf97f643e546f7788248f3f.tar.bz2
[PATCH] knfsd: nfsd4: fix uncomfirmed list
Setclientid code assumes there is only one match in unconfirmed list. Make sure that assumption holds. From: Fred Isaman Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8a5f777..67a038d 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -743,10 +743,13 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)
* nfs4_client, but with the new callback info and a
* new cl_confirm
*/
- if ((unconf) &&
- cmp_verf(&unconf->cl_verifier, &conf->cl_verifier) &&
- cmp_clid(&unconf->cl_clientid, &conf->cl_clientid)) {
- expire_client(unconf);
+ if (unconf) {
+ /* Note this is removing unconfirmed {*x***},
+ * which is stronger than RFC recommended {vxc**}.
+ * This has the advantage that there is at most
+ * one {*x***} in either list at any time.
+ */
+ expire_client(unconf);
}
new = create_client(clname, dname);
if (new == NULL)