Further fix previous branch 2-1 merge

diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c
index de1803eacb5aeaf688f9f4904720e0748df54291..5c29e19ca8fc6be1af70a8b1f8be2b4bff493e57 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@ -90,9 +90,9 @@ static int exclusive;           /* Exclusive volume access */
 static struct db_param db_param = {
     NULL,                       /* Volume dirpath */
     1,                          /* bdb logfile autoremove */
-    256 * 1024,                  /* bdb cachesize (256 MB) */
-    5000,                       /* maxlocks */
-    5000,                       /* maxlockobjs */
+    64 * 1024,                  /* bdb cachesize (64 MB) */
+    DEFAULT_MAXLOCKS,           /* maxlocks */
+    DEFAULT_MAXLOCKOBJS,        /* maxlockobjs */
     -1,                         /* not used ... */
     -1,
     "",

diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c
index 7666807df5dcfec7ef531e7ea7ec81b98bdf2c10..f263329df364ddcb9185ce65601cd68de4560009 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -1160,7 +1160,9 @@ int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *vi, dbd_flags_t flags)
     const char *tmpdb_path = NULL;
 
     /* Set cachesize for in-memory rebuild db */
-    db_param.cachesize = 256 * 1024 * 1024; /* 128 MB */
+    db_param.cachesize = 128 * 1024; /* 128 MB */
+    db_param.maxlocks = DEFAULT_MAXLOCKS;
+    db_param.maxlockobjs = DEFAULT_MAXLOCKOBJS;
 
     /* Make it accessible for all funcs */
     dbd = dbd_ref;

diff --git a/etc/cnid_dbd/db_param.c b/etc/cnid_dbd/db_param.c
index e31e782759830629536f25a8d95dcffc7517b57c..c89f8e5cec00890c2d9b4a3e8410241cc7b684a7 100644 (file)
--- a/etc/cnid_dbd/db_param.c
+++ b/etc/cnid_dbd/db_param.c
@@ -25,16 +25,6 @@
 #define DB_PARAM_FN       "db_param"
 #define MAXKEYLEN         64
 
-#define DEFAULT_LOGFILE_AUTOREMOVE 1
-#define DEFAULT_CACHESIZE          (8 * 1024) /* KB, so 8 MB */
-#define DEFAULT_MAXLOCKS           5000
-#define DEFAULT_MAXLOCKOBJS        5000
-#define DEFAULT_FLUSH_FREQUENCY    1000
-#define DEFAULT_FLUSH_INTERVAL     1800
-#define DEFAULT_USOCK_FILE         "usock"
-#define DEFAULT_FD_TABLE_SIZE      512
-#define DEFAULT_IDLE_TIMEOUT       (10 * 60)
-
 static struct db_param params;
 static int parse_err;
 

diff --git a/etc/cnid_dbd/db_param.h b/etc/cnid_dbd/db_param.h
index 67ec62e4e18c8fc6f40c5f02c8e9f5aa72948621..f3a4827a031a5f99e5fa055c2232d228539024f2 100644 (file)
--- a/etc/cnid_dbd/db_param.h
+++ b/etc/cnid_dbd/db_param.h
@@ -10,6 +10,16 @@
 #include <sys/param.h>
 #include <sys/cdefs.h>
 
+#define DEFAULT_LOGFILE_AUTOREMOVE 1
+#define DEFAULT_CACHESIZE          (8 * 1024) /* KB, so 8 MB */
+#define DEFAULT_MAXLOCKS           5000
+#define DEFAULT_MAXLOCKOBJS        5000
+#define DEFAULT_FLUSH_FREQUENCY    1000
+#define DEFAULT_FLUSH_INTERVAL     1800
+#define DEFAULT_USOCK_FILE         "usock"
+#define DEFAULT_FD_TABLE_SIZE      512
+#define DEFAULT_IDLE_TIMEOUT       (10 * 60)
+
 struct db_param {
     char *dir;
     int logfile_autoremove;