[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1318-g4aaf4e7

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  4aaf4e7e73a5c7fa97ef730fbff5c7cb12df2d6c (commit)
      from  edaf52a301a38824c8beb30c49fba27c8fb0461a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 4aaf4e7e73a5c7fa97ef730fbff5c7cb12df2d6c
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Wed Jan 9 23:00:48 2008 +0100

    Fix the max_dead_record calculations

-----------------------------------------------------------------------

Summary of changes:
 source/lib/tdb/common/open.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/open.c b/source/lib/tdb/common/open.c
index 6bd8fda..94140a4 100644
--- a/source/lib/tdb/common/open.c
+++ b/source/lib/tdb/common/open.c
@@ -179,9 +179,7 @@ struct tdb_context *tdb_open_ex(const char *name, int 
hash_size, int tdb_flags,
                tdb->page_size = 0x2000;
        }
 
-       if (open_flags & TDB_VOLATILE) {
-               tdb->max_dead_records = 5;
-       }
+       tdb->max_dead_records = (open_flags & TDB_VOLATILE) ? 5 : 0;
 
        if ((open_flags & O_ACCMODE) == O_WRONLY) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: can't open tdb %s 
write-only\n",
@@ -288,7 +286,6 @@ struct tdb_context *tdb_open_ex(const char *name, int 
hash_size, int tdb_flags,
        tdb->map_size = st.st_size;
        tdb->device = st.st_dev;
        tdb->inode = st.st_ino;
-       tdb->max_dead_records = 0;
        tdb_mmap(tdb);
        if (locked) {
                if (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_UNLCK, 
F_SETLK, 0, 1) == -1) {


-- 
Samba Shared Repository