[PATCH] knfsd: nfsd4: setclientid simplification

We can be a little more concise here.

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 fb9b4eb..2a59d17 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -674,23 +674,13 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)
                 * or different ip_address
                 */
                status = nfserr_clid_inuse;
-               if (!cmp_creds(&clp->cl_cred,&rqstp->rq_cred)) {
+               if (!cmp_creds(&clp->cl_cred,&rqstp->rq_cred)
+                               || clp->cl_addr != ip_addr) {
                        printk("NFSD: setclientid: string in use by client"
                        "(clientid %08x/%08x)\n",
                        clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id);
                        goto out;
                }
-               if (clp->cl_addr != ip_addr) { 
-                       printk("NFSD: setclientid: string in use by client"
-                       "(clientid %08x/%08x)\n",
-                       clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id);
-                       goto out;
-               }
-
-               /* 
-                * cl_name match from a previous SETCLIENTID operation
-                * XXX check for additional matches?
-                */
                conf = clp;
                break;
        }