[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>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8a5f777b1e969f27c2f8811f11c0d42bf66da0cb..67a038dc0d0ea9af9857ba07ae165ecf22e54a45 100644 (file)
--- 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)