STABLE14-unbalanced-unlock-20050610

Addition of __EXPERIMENTAL_CALLBACK_CONN_MOVING if defined left an
unbalanced H_UNLOCK.

Semi-colons after H_LOCK and H_UNLOCK were missing.

(cherry picked from commit 4af80bc2045ee85592a82bc9aacaee71f8667ea0)

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index fb3a071c7675a53ddbce25a14ddc17eaa3a4fc12..4dab214e3f69151fec2a78e103846dcc55acd8f0 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -7249,8 +7249,7 @@ SRXAFS_CallBackRxConnAddr (struct rx_call * acall, afs_int32 *addr)
 #ifndef __EXPERIMENTAL_CALLBACK_CONN_MOVING
     errorCode = 1;
 #else
-
-    H_LOCK
+    H_LOCK;
     tclient = h_FindClient_r(tcon);
     thost = tclient->host;
     
@@ -7283,9 +7282,9 @@ SRXAFS_CallBackRxConnAddr (struct rx_call * acall, afs_int32 *addr)
                             thost->port, 1, sc, 0);
     rx_SetConnDeadTime(conn, 2); 
     rx_SetConnHardDeadTime(conn, AFS_HARDDEADTIME); 
-    H_UNLOCK
+    H_UNLOCK;
     errorCode = RXAFSCB_Probe(conn);
-    H_LOCK
+    H_LOCK;
     if (!errorCode) {
        if ( thost->callback_rxcon )
            rx_DestroyConnection(thost->callback_rxcon);
@@ -7299,10 +7298,10 @@ SRXAFS_CallBackRxConnAddr (struct rx_call * acall, afs_int32 *addr)
     } else {
        rx_DestroyConnection(conn);
     }      
+  Bad_CallBackRxConnAddr:
+    H_UNLOCK;
 #endif
 
- Bad_CallBackRxConnAddr:
-    H_UNLOCK;
     errorCode = CallPostamble(tcon, errorCode);
  Bad_CallBackRxConnAddr1:
     return errorCode;          /* failure */