[PATCH] knfsd: nfsd4: fix setclientid_confirm error return

NFS4_INVAL is not a valid error for setclientid_confirm, and INUSE is the more
logical error here anyway.

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 997343c23043e80fa2a8460fd8fd256556693036..2dc6da74ccea3421b7463f6e0fec3148820db4e5 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -849,12 +849,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confi
        nfs4_lock_state();
        clp = find_confirmed_client(clid);
        if (clp) {
-               status = nfserr_inval;
-               /* 
-                * Found a record for this clientid. If the IP addresses
-                * don't match, return ERR_INVAL just as if the record had
-                * not been found.
-                */
+               status = nfserr_clid_inuse;
                if (clp->cl_addr != ip_addr) { 
                        printk("NFSD: setclientid: string in use by client"
                        "(clientid %08x/%08x)\n",
@@ -865,7 +860,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confi
        }
        clp = find_unconfirmed_client(clid);
        if (clp) {
-               status = nfserr_inval;
+               status = nfserr_clid_inuse;
                if (clp->cl_addr != ip_addr) { 
                        printk("NFSD: setclientid: string in use by client"
                        "(clientid %08x/%08x)\n",
@@ -949,7 +944,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confi
                goto out;
        }
        /* check that we have hit one of the cases...*/
-       status = nfserr_inval;
+       status = nfserr_clid_inuse;
        goto out;
 out:
        if (!status)