init linux rwlocks we missed before

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Need to declare new lock extern.

====================

init linux rwlocks we missed before

(cherry picked from commit fee78214f69ae4895e47e3c9b70e354646c154b6)

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index c7796f22e187409ecff3ce1779cddcf0f49ae92b..b3e7cd2608911e46b88e02e567569603d45c946d 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -200,7 +200,7 @@ int init_module(void)
 #endif
 #endif
 
-
+    RWLOCK_INIT(&afs_xosi, "afs_xosi");
 
     /* obtain PAGE_OFFSET value */
     afs_linux_page_offset = get_page_offset();

diff --git a/src/afs/LINUX/osi_prototypes.h b/src/afs/LINUX/osi_prototypes.h
index 615fb453c9466f4baf2030fe4e02b9567361b3b3..0d119216ca70201dc6374df8bd2f281aee8dd4a2 100644 (file)
--- a/src/afs/LINUX/osi_prototypes.h
+++ b/src/afs/LINUX/osi_prototypes.h
@@ -27,6 +27,8 @@ extern cred_t *crdup(cred_t *cr);
 extern cred_t *crref(void);
 extern void crset(cred_t *cr);
 
+/* osi_file.c */
+extern afs_rwlock_t afs_xosi;
 
 /* osi_misc.c */
 extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink,

diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c
index 2f157ae14e041c111d135e3ba41cbb2379d3976f..7f830f2459acc569d8e75497141d539e3ff74735 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -39,6 +39,7 @@ extern afs_rwlock_t afs_xaxs;
 extern afs_rwlock_t afs_xvolume;
 extern afs_rwlock_t afs_xuser;
 extern afs_rwlock_t afs_xserver;
+extern afs_rwlock_t afs_xsrvAddr;
 #ifndef AFS_AIX41_ENV
 extern afs_lock_t osi_fsplock;
 #endif
@@ -89,6 +90,7 @@ extern afs_int32 usedihint;
 
 /* afs_server.c */
 extern afs_int32 afs_setTime;
+extern afs_rwlock_t afs_xsrvAddr;
 
 /* Imported functions. */
 extern struct rx_securityClass *rxnull_NewServerSecurityObject();
@@ -521,6 +523,8 @@ afs_ResourceInit(preallocs)
     RWLOCK_INIT(&afs_xvolume, "afs_xvolume");
     RWLOCK_INIT(&afs_xcell, "afs_xcell");
     RWLOCK_INIT(&afs_xserver, "afs_xserver");
+    RWLOCK_INIT(&afs_xsrvAddr, "afs_xsrvAddr");
+    RWLOCK_INIT(&afs_icl_lock, "afs_icl_lock");
     RWLOCK_INIT(&afs_xinterface, "afs_xinterface");
     LOCK_INIT(&afs_puttofileLock, "afs_puttofileLock");
 #ifndef        AFS_AIX32_ENV