From: Peter Somogyi <psomogyi@gamax.hu>
Date: Thu, 14 Apr 2005 03:00:36 +0000 (+0000)
Subject: STABLE14-aix-volser-fix-retry-20050413
X-Git-Tag: openafs-devel-1_3_82~70
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3b1e4855a29d1772a08d8c48aaaf1dfc2b2f5919;p=packages%2Fo%2Fopenafs.git

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 5167bd9b3..a0ebab90d 100644
--- 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 a6d5a1690..48eeecf81 100644
--- 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);
 	}
     }