Author: vlendec
Date: 2007-08-07 11:28:04 +0000 (Tue, 07 Aug 2007)
New Revision: 24266

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24266

Log:
Remove the "open files database hash size" parameter

This has been superseded by the "tdb_hashsize:<tdbname>" parameter

Modified:
   branches/SAMBA_3_2/source/locking/brlock.c
   branches/SAMBA_3_2/source/locking/locking.c
   branches/SAMBA_3_2/source/param/loadparm.c
   branches/SAMBA_3_2_0/source/locking/brlock.c
   branches/SAMBA_3_2_0/source/locking/locking.c
   branches/SAMBA_3_2_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_2/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_2/source/locking/brlock.c  2007-08-07 11:21:48 UTC (rev 
24265)
+++ branches/SAMBA_3_2/source/locking/brlock.c  2007-08-07 11:28:04 UTC (rev 
24266)
@@ -263,8 +263,7 @@
        if (brlock_db) {
                return;
        }
-       brlock_db = db_open(NULL, lock_path("brlock.tdb"),
-                           lp_open_files_db_hash_size(),
+       brlock_db = db_open(NULL, lock_path("brlock.tdb"), 0,
                            TDB_DEFAULT
                            |TDB_VOLATILE
                            |(read_only?0x0:TDB_CLEAR_IF_FIRST),

Modified: branches/SAMBA_3_2/source/locking/locking.c
===================================================================
--- branches/SAMBA_3_2/source/locking/locking.c 2007-08-07 11:21:48 UTC (rev 
24265)
+++ branches/SAMBA_3_2/source/locking/locking.c 2007-08-07 11:28:04 UTC (rev 
24266)
@@ -394,8 +394,7 @@
        if (lock_db)
                return True;
 
-       lock_db = db_open(NULL, lock_path("locking.tdb"),
-                         lp_open_files_db_hash_size(),
+       lock_db = db_open(NULL, lock_path("locking.tdb"), 0,
                          TDB_DEFAULT
                          |TDB_VOLATILE
                          |(read_only?0x0:TDB_CLEAR_IF_FIRST),

Modified: branches/SAMBA_3_2/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2/source/param/loadparm.c  2007-08-07 11:21:48 UTC (rev 
24265)
+++ branches/SAMBA_3_2/source/param/loadparm.c  2007-08-07 11:28:04 UTC (rev 
24266)
@@ -1042,7 +1042,6 @@
        {"max disk size", P_INTEGER, P_GLOBAL, &Globals.maxdisksize, NULL, 
NULL, FLAG_ADVANCED}, 
        {"max open files", P_INTEGER, P_GLOBAL, &Globals.max_open_files, NULL, 
NULL, FLAG_ADVANCED}, 
        {"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, 
NULL, FLAG_ADVANCED | FLAG_PRINT}, 
-       {"open files database hash size", P_INTEGER, P_GLOBAL, 
&Globals.open_files_db_hash_size, NULL, NULL, FLAG_ADVANCED}, 
 
        {"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL, 
NULL, FLAG_ADVANCED}, 
        {"strict allocate", P_BOOL, P_LOCAL, &sDefault.bStrictAllocate, NULL, 
NULL, FLAG_ADVANCED | FLAG_SHARE}, 

Modified: branches/SAMBA_3_2_0/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_2_0/source/locking/brlock.c        2007-08-07 11:21:48 UTC 
(rev 24265)
+++ branches/SAMBA_3_2_0/source/locking/brlock.c        2007-08-07 11:28:04 UTC 
(rev 24266)
@@ -263,8 +263,7 @@
        if (brlock_db) {
                return;
        }
-       brlock_db = db_open(NULL, lock_path("brlock.tdb"),
-                           lp_open_files_db_hash_size(),
+       brlock_db = db_open(NULL, lock_path("brlock.tdb"), 0,
                            TDB_DEFAULT
                            |TDB_VOLATILE
                            |(read_only?0x0:TDB_CLEAR_IF_FIRST),

Modified: branches/SAMBA_3_2_0/source/locking/locking.c
===================================================================
--- branches/SAMBA_3_2_0/source/locking/locking.c       2007-08-07 11:21:48 UTC 
(rev 24265)
+++ branches/SAMBA_3_2_0/source/locking/locking.c       2007-08-07 11:28:04 UTC 
(rev 24266)
@@ -394,8 +394,7 @@
        if (lock_db)
                return True;
 
-       lock_db = db_open(NULL, lock_path("locking.tdb"),
-                         lp_open_files_db_hash_size(),
+       lock_db = db_open(NULL, lock_path("locking.tdb"), 0,
                          TDB_DEFAULT
                          |TDB_VOLATILE
                          |(read_only?0x0:TDB_CLEAR_IF_FIRST),

Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2_0/source/param/loadparm.c        2007-08-07 11:21:48 UTC 
(rev 24265)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c        2007-08-07 11:28:04 UTC 
(rev 24266)
@@ -1045,7 +1045,6 @@
        {"max disk size", P_INTEGER, P_GLOBAL, &Globals.maxdisksize, NULL, 
NULL, FLAG_ADVANCED}, 
        {"max open files", P_INTEGER, P_GLOBAL, &Globals.max_open_files, NULL, 
NULL, FLAG_ADVANCED}, 
        {"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, 
NULL, FLAG_ADVANCED | FLAG_PRINT}, 
-       {"open files database hash size", P_INTEGER, P_GLOBAL, 
&Globals.open_files_db_hash_size, NULL, NULL, FLAG_ADVANCED}, 
 
        {"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL, 
NULL, FLAG_ADVANCED}, 
        {"strict allocate", P_BOOL, P_LOCAL, &sDefault.bStrictAllocate, NULL, 
NULL, FLAG_ADVANCED | FLAG_SHARE}, 

Reply via email to