From: Derrick Brashear <shadow@dementix.org>
Date: Sat, 21 Jul 2012 04:27:49 +0000 (-0400)
Subject: ubik: don't force an error just because calliter is early returning
X-Git-Tag: upstream/1.8.0_pre1^2~2182
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d3761b9e6265df47e38e166983711a591ef48b31;p=packages%2Fo%2Fopenafs.git

ubik: don't force an error just because calliter is early returning

in this case, racing another ClientInit caller is not fatal.
clean up from 56b5b9a1c51c2197923aa373c180a834edabe4f6 which was
my fault.

Change-Id: I81d3298a775ed46972779b4121498560883fee01
Reviewed-on: http://gerrit.openafs.org/7803
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Garrett Wollman <wollman@csail.mit.edu>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index dda1f35ff..dc1067ffa 100644
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -451,12 +451,9 @@ CallIter(int (*aproc) (), struct ubik_client *aclient,
     code =
 	(*aproc) (tc, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13,
 		  p14, p15, p16);
-    if (aclient->initializationState != origLevel) {
+    if (aclient->initializationState != origLevel)
 	/* somebody did a ubik_ClientInit */
-	if (code == 0)
-	    code = UINTERNAL;	/* no more specific error was returned */
 	goto errout;
-    }
 
     /* what should I do in case of UNOQUORUM ? */
     if (code < 0) {