don't need shmem any more

(This used to be commit a81371a4fd6f7972b054bea90428d1d2fd6d1d22)

3 files changed, 0 insertions, 38 deletions

diff --git a/source3/include/local.h b/source3/include/local.h
index fbde799e5c..b5590f9f91 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -47,11 +47,6 @@
 #define SYSLOG_FACILITY LOG_DAEMON
 #endif
 
-/* Default size of shared memory used for share mode locking */
-#ifndef SHMEM_SIZE
-#define SHMEM_SIZE (1024*1024)
-#endif
-
 /* 
  * Default number of maximum open files per smbd. This is
  * also limited by the maximum available file descriptors
diff --git a/source3/include/smb.h b/source3/include/smb.h
index fdd987457b..67ca5ef173 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -680,35 +680,6 @@ typedef struct
 #define SHAREMODE_FN(fn) \
 	void (*fn)(share_mode_entry *, char*)
 
-/* each implementation of the share mode code needs
-   to support the following operations */
-struct share_ops {
-	BOOL (*stop_mgmt)(void);
-	BOOL (*lock_entry)(connection_struct *, SMB_DEV_T , SMB_INO_T , int *);
-	BOOL (*unlock_entry)(connection_struct *, SMB_DEV_T , SMB_INO_T , int );
-	int (*get_entries)(connection_struct *, int , SMB_DEV_T , SMB_INO_T , share_mode_entry **);
-	void (*del_entry)(int , files_struct *);
-	BOOL (*set_entry)(int, files_struct *, uint16 , uint16 );
-    BOOL (*mod_entry)(int, files_struct *, void (*)(share_mode_entry *, SMB_DEV_T, SMB_INO_T, void *), void *);
-	int (*forall)(void (*)(share_mode_entry *, char *));
-	void (*status)(FILE *);
-};
-
-/* each implementation of the shared memory code needs
-   to support the following operations */
-struct shmem_ops {
-	BOOL (*shm_close)( void );
-	int (*shm_alloc)(int );
-	BOOL (*shm_free)(int );
-	int (*get_userdef_off)(void);
-	void *(*offset2addr)(int );
-	int (*addr2offset)(void *addr);
-	BOOL (*lock_hash_entry)(unsigned int);
-	BOOL (*unlock_hash_entry)( unsigned int );
-	BOOL (*get_usage)(int *,int *,int *);
-	unsigned (*hash_size)(void);
-};
-
 /*
  * Each implementation of the password database code needs
  * to support the following operations.
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 57db8f0e87..3650d4edd3 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -188,7 +188,6 @@ typedef struct
 	int ReadSize;
 	int lm_announce;
 	int lm_interval;
-	int shmem_size;
 	int client_code_page;
 	int announce_as;	/* This is initialised in init_globals */
 	int machine_password_timeout;
@@ -770,7 +769,6 @@ static struct parm_struct parm_table[] = {
 	{"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, NULL, FLAG_PRINT},
 	{"read size", P_INTEGER, P_GLOBAL, &Globals.ReadSize, NULL, NULL, 0},
 	
-	{"shared mem size", P_INTEGER, P_GLOBAL, &Globals.shmem_size, NULL, NULL, 0},
 	{"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL, NULL, 0},
 	{"stat cache size", P_INTEGER, P_GLOBAL, &Globals.stat_cache_size, NULL, NULL, 0},
 	{"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_SHARE},
@@ -1071,7 +1069,6 @@ static void init_globals(void)
 	Globals.ReadSize = 16 * 1024;
 	Globals.lm_announce = 2;	/* = Auto: send only if LM clients found */
 	Globals.lm_interval = 60;
-	Globals.shmem_size = SHMEM_SIZE;
 	Globals.stat_cache_size = 50;	/* Number of stat translations we'll keep */
 	Globals.announce_as = ANNOUNCE_AS_NT_SERVER;
 	Globals.bUnixRealname = True;
@@ -1437,7 +1434,6 @@ FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
 FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
 FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
 FN_GLOBAL_INTEGER(lp_readsize, &Globals.ReadSize)
-FN_GLOBAL_INTEGER(lp_shmem_size, &Globals.shmem_size)
 FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
 FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
 FN_GLOBAL_INTEGER(lp_security, &Globals.security)