lower the default hash size if SEMMSL isn't defined

(This used to be commit 9f0be847fdbcf0f8bbd69de6cdf277ae0440bcda)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index d7a576de857227ee890ba5aa227f71c5ee64cacd..cdd7bcac7ad4a64bedcf7288a73f861de7d3543c 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -49,7 +49,7 @@
 #ifdef SEMMSL
 #define SHMEM_HASH_SIZE (SEMMSL-1)
 #else
-#define SHMEM_HASH_SIZE 113
+#define SHMEM_HASH_SIZE 15
 #endif
 #endif
 
@@ -1312,9 +1312,6 @@ typedef struct
 } share_mode_entry;
 
 
-/* Conversion to hash entry index from device and inode numbers. */
-#define HASH_ENTRY(dev,ino) ((( (uint32)(dev) )* ( (uint32)(ino) )) % lp_shmem_hash_size())
-
 /* each implementation of the share mode code needs
    to support the following operations */
 struct share_ops {

diff --git a/source3/locking/locking_shm.c b/source3/locking/locking_shm.c
index f2ae641808632b601f85cf64814b471f48a75835..3abd6b25a70c967f86dc44aff2f5bbc5f9e12ceb 100644 (file)
--- a/source3/locking/locking_shm.c
+++ b/source3/locking/locking_shm.c
@@ -62,6 +62,11 @@ typedef struct
 
 static int read_only;
 
+
+/* Conversion to hash entry index from device and inode numbers. */
+#define HASH_ENTRY(dev,ino) ((( (uint32)(dev) )* ( (uint32)(ino) )) % lp_shmem_hash_size())
+
+
 /*******************************************************************
   deinitialize the shared memory for share_mode management 
   ******************************************************************/