STABLE14-aix-volser-fix-retry-20050413

FIXES 18240

destroy lock only after we gave up permanently

(cherry picked from commit 9307de2fe7780b2df43b5f8e21871f8e5eb633dc)

diff --git a/src/vol/fssync.c b/src/vol/fssync.c
index 5167bd9b3d991677490e6f5a0f98f9751408333e..a0ebab90de3e04894939406cd0c8d0b2c4dac165 100644 (file)
--- a/src/vol/fssync.c
+++ b/src/vol/fssync.c
@@ -197,7 +197,6 @@ FSYNC_clientFinis(void)
     close(FS_sd);
 #endif
     FS_sd = -1;
-    Lock_Destroy(&FSYNC_handler_lock);
 }
 
 int

diff --git a/src/vol/volume.c b/src/vol/volume.c
index a6d5a1690203bd536c86753fa9377b91818afa01..48eeecf81693e685138daccfb712bdfb3696dfc3 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -325,6 +325,7 @@ VInitVolumePackage(ProgramType pt, int nLargeVnodes, int nSmallVnodes,
     if (programType == volumeUtility && connect) {
        if (!VConnectFS()) {
            Log("Unable to connect to file server; aborted\n");
+           Lock_Destroy(&FSYNC_handler_lock);
            exit(1);
        }
     }