From a2b612f73f3015063bc020f85bd84a5a2d7b9bf3 Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Tue, 13 Sep 2005 01:25:39 -0700
Subject: [PATCH] --- yaml --- r: 8783 b: refs/heads/master c:
 73aea4ecd38ebeff9e322f738057f4ae2c32a3ee h: refs/heads/master i:   8781:
 2eb92bbab8da455f2e1615d160c084094ff98237   8779:
 0803cc9154aa78916a22beba4b14ce788bf4e361   8775:
 50ce8664e2a57e5ea6b4237ce750b29163d0cb14   8767:
 67dce808ad1908c86feed7eafa72d95a4d2dcafb v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfsd/nfs4state.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4deaa6efda9d..67c8c958635a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b59e3c0e172e3f3a147021aa16b929482b8d5846
+refs/heads/master: 73aea4ecd38ebeff9e322f738057f4ae2c32a3ee
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index ec2fdb009bf1..6bbefd06f10d 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -678,13 +678,12 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)
 	int 			status;
 	char                    dname[HEXDIR_LEN];
 	
-	status = nfserr_inval;
 	if (!check_name(clname))
-		goto out;
+		return nfserr_inval;
 
 	status = nfs4_make_rec_clidname(dname, &clname);
 	if (status)
-		goto out;
+		return status;
 
 	/* 
 	 * XXX The Duplicate Request Cache (DRC) has been checked (??)