From 453bc2469feaf081e5e848b268e230658fb47c16 Mon Sep 17 00:00:00 2001
From: Jeffrey Hutzelman <jhutz@cmu.edu>
Date: Thu, 24 Aug 2006 21:21:49 +0000
Subject: [PATCH] STABLE14-vol-init-locallock-20060824

we never init this. oops.


(cherry picked from commit bfdf13de063363c34ece1a289e16136613cafaf8)
---
 src/vol/volume.c     | 2 +-
 src/volser/volmain.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 7eb8854e8..0aa3e558e 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -185,7 +185,6 @@ int LogLevel;			/* Vice loglevel--not defined as extern so that it will be
 				 * defined when not linked with vice, XXXX */
 ProgramType programType;	/* The type of program using the package */
 
-
 #define VOLUME_BITMAP_GROWSIZE	16	/* bytes, => 128vnodes */
 					/* Must be a multiple of 4 (1 word) !! */
 #define VOLUME_HASH_TABLE_SIZE 128	/* Must be a power of 2!! */
@@ -272,6 +271,7 @@ VInitVolumePackage(ProgramType pt, int nLargeVnodes, int nSmallVnodes,
 #endif /* AFS_PTHREAD_ENV */
     Lock_Init(&vol_listLock);
     Lock_Init(&FSYNC_handler_lock);
+
     srandom(time(0));		/* For VGetVolumeInfo */
     gettimeofday(&tv, &tz);
     TimeZoneCorrection = tz.tz_minuteswest * 60;
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index cef3762b4..215a90d91 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -73,6 +73,7 @@ RCSID
 #define VolserVersion "2.0"
 #define N_SECURITY_OBJECTS 3
 
+extern struct Lock localLock;
 extern struct volser_trans *TransList();
 #ifndef AFS_PTHREAD_ENV
 extern int (*vol_PollProc) ();
@@ -423,6 +424,8 @@ main(int argc, char **argv)
     }
 #endif
     VInitVolumePackage(volumeUtility, 0, 0, CONNECT_FS, 0);
+    /* For nuke() */
+    Lock_Init(&localLock);
     DInit(40);
 #ifndef AFS_PTHREAD_ENV
     vol_PollProc = IOMGR_Poll;	/* tell vol pkg to poll io system periodically */
-- 
2.39.5