summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-01-10 15:41:08 +1300
committerMichael Adam <obnox@samba.org>2014-01-31 08:05:47 +0100
commit413e0b68729f468f49a5803b44789dba6db9dd83 (patch)
tree35efe6aa83afd039d59fc944feca9a07b7aee814
parent35eb6cb521d54708f0bbba515f645327846b4e70 (diff)
downloadsamba-413e0b68729f468f49a5803b44789dba6db9dd83.tar.gz
param: Complete the removal of the "open files database hash size" parameter
This parameter was originally set for removal in 2007 in 28210588edc39eb2b6cd237f11b488fa4d6b6985 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--lib/param/param_functions.c1
-rw-r--r--source3/locking/brlock.c2
-rw-r--r--source3/locking/share_mode_lock.c2
-rw-r--r--source3/param/loadparm.c1
4 files changed, 2 insertions, 4 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index dfdaf4f4670..5ba9c58b504 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -322,7 +322,6 @@ FN_GLOBAL_INTEGER(max_xmit, max_xmit)
FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout)
FN_GLOBAL_INTEGER(nbt_port, nbt_port)
-FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size)
FN_GLOBAL_INTEGER(oplock_break_wait_time, oplock_break_wait_time)
FN_GLOBAL_INTEGER(os_level, os_level)
FN_GLOBAL_INTEGER(passwd_chat_timeout, passwd_chat_timeout)
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index c5297dd6e2c..e1f0c158127 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -326,7 +326,7 @@ void brl_init(bool read_only)
}
brlock_db = db_open(NULL, lock_path("brlock.tdb"),
- lp_open_files_db_hash_size(), tdb_flags,
+ SMB_OPEN_DATABASE_TDB_HASH_SIZE, tdb_flags,
read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644,
DBWRAP_LOCK_ORDER_2);
if (!brlock_db) {
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 940d1253f47..20756bf5d71 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -64,7 +64,7 @@ static bool locking_init_internal(bool read_only)
return True;
lock_db = db_open(NULL, lock_path("locking.tdb"),
- lp_open_files_db_hash_size(),
+ SMB_OPEN_DATABASE_TDB_HASH_SIZE,
TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
read_only?O_RDONLY:O_RDWR|O_CREAT, 0644,
DBWRAP_LOCK_ORDER_1);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4a9e0d70ec9..e5a427121ea 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -823,7 +823,6 @@ static void init_globals(bool reinit_globals)
Globals.large_readwrite = true;
Globals.max_log_size = 5000;
Globals.max_open_files = max_open_files();
- Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE;
Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
Globals.srv_minprotocol = PROTOCOL_LANMAN1;
Globals.cli_maxprotocol = PROTOCOL_NT1;