From dd49f4c9dac894248a519e0f0e49a770fc5cddd0 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 23 Jun 2005 22:04:09 -0700 Subject: [PATCH] --- yaml --- r: 3119 b: refs/heads/master c: 22de4d837439071a0bec897485d3911383b6ffad h: refs/heads/master i: 3117: 6d893c664b5e69f74e1b82aa3f7baf43c7271286 3115: 973eaf8976b6a4f35e88af52382682267f66f03f 3111: 50c988efc229058315810988a6a14579c52f0604 3103: dacdf9e77b3090d5fc5fefa90e842fc9d690cd6b v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3889f226656c..a3759106f44b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a69c179a28a9bb9f4d086927b192d5cffe88e50 +refs/heads/master: 22de4d837439071a0bec897485d3911383b6ffad diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 997343c23043..2dc6da74ccea 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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)