diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8a06cb07896aeda9774d5f72c0feea09073dfc0e..aca84c942595b479049c83eb8386421c990b46ec 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1545,13 +1545,11 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
 	status = nfs4_make_rec_clidname(dname, &exid->clname);
 
 	if (status)
-		goto error;
+		return status;
 
 	strhashval = clientstr_hashval(dname);
 
 	nfs4_lock_state();
-	status = nfs_ok;
-
 	conf = find_confirmed_client_by_str(dname, strhashval);
 	if (conf) {
 		if (!clp_used_exchangeid(conf)) {
@@ -1630,8 +1628,6 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
 
 out:
 	nfs4_unlock_state();
-error:
-	dprintk("nfsd4_exchange_id returns %d\n", ntohl(status));
 	return status;
 }