--- /dev/null
+/*
+*  linux/fs/nfsd/nfs4recover.c
+*
+*  Copyright (c) 2004 The Regents of the University of Michigan.
+*  All rights reserved.
+*
+*  Andy Adamson <andros@citi.umich.edu>
+*
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
+*  are met:
+*
+*  1. Redistributions of source code must retain the above copyright
+*     notice, this list of conditions and the following disclaimer.
+*  2. Redistributions in binary form must reproduce the above copyright
+*     notice, this list of conditions and the following disclaimer in the
+*     documentation and/or other materials provided with the distribution.
+*  3. Neither the name of the University nor the names of its
+*     contributors may be used to endorse or promote products derived
+*     from this software without specific prior written permission.
+*
+*  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+*  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+*  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+*  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+*  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+*  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+*  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+*  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+*  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+
+#include <linux/sunrpc/svc.h>
+#include <linux/nfsd/nfsd.h>
+#include <linux/nfs4.h>
+#include <linux/nfsd/state.h>
+#include <linux/nfsd/xdr4.h>
+#include <asm/uaccess.h>
+#include <asm/scatterlist.h>
+#include <linux/crypto.h>
+
+
+#define NFSDDBG_FACILITY                NFSDDBG_PROC
+
+static void
+md5_to_hex(char *out, char *md5)
+{
+       int i;
+
+       for (i=0; i<16; i++) {
+               unsigned char c = md5[i];
+
+               *out++ = '0' + ((c&0xf0)>>4) + (c>=0xa0)*('a'-'9'-1);
+               *out++ = '0' + (c&0x0f) + ((c&0x0f)>=0x0a)*('a'-'9'-1);
+       }
+       *out = '\0';
+}
+
+int
+nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)
+{
+       struct xdr_netobj cksum;
+       struct crypto_tfm *tfm;
+       struct scatterlist sg[1];
+       int status = nfserr_resource;
+
+       dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
+                       clname->len, clname->data);
+       tfm = crypto_alloc_tfm("md5", 0);
+       if (tfm == NULL)
+               goto out;
+       cksum.len = crypto_tfm_alg_digestsize(tfm);
+       cksum.data = kmalloc(cksum.len, GFP_KERNEL);
+       if (cksum.data == NULL)
+               goto out;
+       crypto_digest_init(tfm);
+
+       sg[0].page = virt_to_page(clname->data);
+       sg[0].offset = offset_in_page(clname->data);
+       sg[0].length = clname->len;
+
+       crypto_digest_update(tfm, sg, 1);
+       crypto_digest_final(tfm, cksum.data);
+
+       md5_to_hex(dname, cksum.data);
+
+       kfree(cksum.data);
+       status = nfs_ok;
+out:
+       if (tfm)
+               crypto_free_tfm(tfm);
+       return status;
+}
 
 
 #define clientid_hashval(id) \
        ((id) & CLIENT_HASH_MASK)
-#define clientstr_hashval(name, namelen) \
-       (opaque_hashval((name), (namelen)) & CLIENT_HASH_MASK)
+#define clientstr_hashval(name) \
+       (opaque_hashval((name), 8) & CLIENT_HASH_MASK)
 /*
  * reclaim_str_hashtbl[] holds known client info from previous reset/reboot
  * used in reboot/reset lease grace period processing
 }
 
 static struct nfs4_client *
-create_client(struct xdr_netobj name) {
+create_client(struct xdr_netobj name, char *recdir) {
        struct nfs4_client *clp;
 
        if (!(clp = alloc_client(name)))
                goto out;
+       memcpy(clp->cl_recdir, recdir, HEXDIR_LEN);
        atomic_set(&clp->cl_count, 1);
        atomic_set(&clp->cl_callback.cb_set, 0);
        clp->cl_callback.cb_parsed = 0;
        get_group_info(target->cr_group_info);
 }
 
-static int
-cmp_name(struct xdr_netobj *n1, struct xdr_netobj *n2) {
-       if (!n1 || !n2)
-               return 0;
-       return((n1->len == n2->len) && !memcmp(n1->data, n2->data, n2->len));
+static inline int
+same_name(const char *n1, const char *n2) {
+       return 0 == memcmp(n1, n2, HEXDIR_LEN);
 }
 
 static int
        list_del_init(&clp->cl_strhash);
        list_del_init(&clp->cl_idhash);
        list_add(&clp->cl_idhash, &conf_id_hashtbl[idhashval]);
-       strhashval = clientstr_hashval(clp->cl_name.data, 
-                       clp->cl_name.len);
+       strhashval = clientstr_hashval(clp->cl_recdir);
        list_add(&clp->cl_strhash, &conf_str_hashtbl[strhashval]);
        renew_client(clp);
 }
        unsigned int            strhashval;
        struct nfs4_client *    conf, * unconf, * new, * clp;
        int                     status;
+       char                    dname[HEXDIR_LEN];
        
        status = nfserr_inval;
        if (!check_name(clname))
                goto out;
 
+       status = nfs4_make_rec_clidname(dname, &clname);
+       if (status)
+               goto out;
+
        /* 
         * XXX The Duplicate Request Cache (DRC) has been checked (??)
         * We get here on a DRC miss.
         */
 
-       strhashval = clientstr_hashval(clname.data, clname.len);
+       strhashval = clientstr_hashval(dname);
 
        conf = NULL;
        nfs4_lock_state();
        list_for_each_entry(clp, &conf_str_hashtbl[strhashval], cl_strhash) {
-               if (!cmp_name(&clp->cl_name, &clname))
+               if (!same_name(clp->cl_recdir, dname))
                        continue;
                /* 
                 * CASE 0:
        }
        unconf = NULL;
        list_for_each_entry(clp, &unconf_str_hashtbl[strhashval], cl_strhash) {
-               if (!cmp_name(&clp->cl_name, &clname))
+               if (!same_name(clp->cl_recdir, dname))
                        continue;
                /* cl_name match from a previous SETCLIENTID operation */
                unconf = clp;
                 */
                if (unconf)
                        expire_client(unconf);
-               if (!(new = create_client(clname)))
+               new = create_client(clname, dname);
+               if (new == NULL)
                        goto out;
                copy_verf(new, &clverifier);
                new->cl_addr = ip_addr;
                     cmp_clid(&unconf->cl_clientid, &conf->cl_clientid)) {
                                expire_client(unconf);
                }
-               if (!(new = create_client(clname)))
+               new = create_client(clname, dname);
+               if (new == NULL)
                        goto out;
                copy_verf(new,&conf->cl_verifier);
                new->cl_addr = ip_addr;
                 * using input clverifier, clname, and callback info
                 * and generate a new cl_clientid and cl_confirm.
                 */
-               if (!(new = create_client(clname)))
+               new = create_client(clname, dname);
+               if (new == NULL)
                        goto out;
                copy_verf(new,&clverifier);
                new->cl_addr = ip_addr;
                 * new cl_verifier and a new cl_confirm
                 */
                expire_client(unconf);
-               if (!(new = create_client(clname)))
+               new = create_client(clname, dname);
+               if (new == NULL)
                        goto out;
                copy_verf(new,&clverifier);
                new->cl_addr = ip_addr;
        if ((conf && unconf) && 
            (cmp_verf(&unconf->cl_confirm, &confirm)) &&
            (cmp_verf(&conf->cl_verifier, &unconf->cl_verifier)) &&
-           (cmp_name(&conf->cl_name,&unconf->cl_name))  &&
+           (same_name(conf->cl_recdir,unconf->cl_recdir))  &&
            (!cmp_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
                if (!cmp_creds(&conf->cl_cred, &unconf->cl_cred)) 
                        status = nfserr_clid_inuse;
        if ((conf && !unconf) || 
            ((conf && unconf) && 
             (!cmp_verf(&conf->cl_verifier, &unconf->cl_verifier) ||
-             !cmp_name(&conf->cl_name, &unconf->cl_name)))) {
+             !same_name(conf->cl_recdir, unconf->cl_recdir)))) {
                if (!cmp_creds(&conf->cl_cred,&rqstp->rq_cred)) {
                        status = nfserr_clid_inuse;
                } else {
 }
 
 static inline struct nfs4_client_reclaim *
-alloc_reclaim(int namelen)
+alloc_reclaim(void)
 {
-       struct nfs4_client_reclaim *crp = NULL;
-
-       crp = kmalloc(sizeof(struct nfs4_client_reclaim), GFP_KERNEL);
-       if (!crp)
-               return NULL;
-       crp->cr_name.data = kmalloc(namelen, GFP_KERNEL);
-       if (!crp->cr_name.data) {
-               kfree(crp);
-               return NULL;
-       }
-       return crp;
+       return kmalloc(sizeof(struct nfs4_client_reclaim), GFP_KERNEL);
 }
 
 /*
  * failure => all reset bets are off, nfserr_no_grace...
  */
 static int
-nfs4_client_to_reclaim(char *name, int namlen)
+nfs4_client_to_reclaim(char *name)
 {
        unsigned int strhashval;
        struct nfs4_client_reclaim *crp = NULL;
 
-       dprintk("NFSD nfs4_client_to_reclaim NAME: %.*s\n", namlen, name);
-       crp = alloc_reclaim(namlen);
+       dprintk("NFSD nfs4_client_to_reclaim NAME: %.*s\n", HEXDIR_LEN, name);
+       crp = alloc_reclaim();
        if (!crp)
                return 0;
-       strhashval = clientstr_hashval(name, namlen);
+       strhashval = clientstr_hashval(name);
        INIT_LIST_HEAD(&crp->cr_strhash);
        list_add(&crp->cr_strhash, &reclaim_str_hashtbl[strhashval]);
-       memcpy(crp->cr_name.data, name, namlen);
-       crp->cr_name.len = namlen;
+       memcpy(crp->cr_recdir, name, HEXDIR_LEN);
        reclaim_str_hashtbl_size++;
        return 1;
 }
                        crp = list_entry(reclaim_str_hashtbl[i].next,
                                        struct nfs4_client_reclaim, cr_strhash);
                        list_del(&crp->cr_strhash);
-                       kfree(crp->cr_name.data);
                        kfree(crp);
                        reclaim_str_hashtbl_size--;
                }
        if (clp == NULL)
                return NULL;
 
-       dprintk("NFSD: nfs4_find_reclaim_client for %.*s\n",
-                           clp->cl_name.len, clp->cl_name.data);
+       dprintk("NFSD: nfs4_find_reclaim_client for %.*s with recdir %s\n",
+                           clp->cl_name.len, clp->cl_name.data,
+                           clp->cl_recdir);
 
        /* find clp->cl_name in reclaim_str_hashtbl */
-       strhashval = clientstr_hashval(clp->cl_name.data, clp->cl_name.len);
+       strhashval = clientstr_hashval(clp->cl_recdir);
        list_for_each_entry(crp, &reclaim_str_hashtbl[strhashval], cr_strhash) {
-               if (cmp_name(&crp->cr_name, &clp->cl_name)) {
+               if (same_name(crp->cr_recdir, clp->cl_recdir)) {
                        return crp;
                }
        }