Changeset 746 for vendor/current/lib/tdb

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

Location:

vendor/current/lib/tdb/common

Files:

• io.c (modified) (2 diffs)
• open.c (modified) (1 diff)

vendor/current/lib/tdb/common/io.c

@@ -54 +54 @@
         }
 
+        /* Unmap, update size, remap */
+        if (tdb_munmap(tdb) == -1) {
+                tdb->ecode = TDB_ERR_IO;
+                return -1;
+        }
+        tdb->map_size = st.st_size;
+        tdb_mmap(tdb);
+
         if (st.st_size < (size_t)len) {
                 if (!probe) {
@@ -64 +72 @@
         }
 
-        /* Unmap, update size, remap */
-        if (tdb_munmap(tdb) == -1) {
-                tdb->ecode = TDB_ERR_IO;
-                return -1;
-        }
-        tdb->map_size = st.st_size;
-        tdb_mmap(tdb);
         return 0;
 }

vendor/current/lib/tdb/common/open.c

@@ -314 +314 @@
             (!tdb->read_only) &&
             (locked = (tdb_nest_lock(tdb, ACTIVE_LOCK, F_WRLCK, TDB_LOCK_NOWAIT|TDB_LOCK_PROBE) == 0))) {
-                open_flags |= O_CREAT;
-                if (ftruncate(tdb->fd, 0) == -1) {
+                int ret;
+                ret = tdb_brlock(tdb, F_WRLCK, FREELIST_TOP, 0,
+                                TDB_LOCK_WAIT);
+                if (ret == -1) {
                         TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
-                                 "failed to truncate %s: %s\n",
-                                 name, strerror(errno)));
-                        goto fail; /* errno set by ftruncate */
+                                "tdb_brlock failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
+                }
+                ret = tdb_new_database(tdb, hash_size);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "tdb_new_database failed for %s: %s\n",
+                                name, strerror(errno)));
+                        tdb_unlockall(tdb);
+                        goto fail;
+                }
+                ret = tdb_brunlock(tdb, F_WRLCK, FREELIST_TOP, 0);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "tdb_unlockall failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
+                }
+                ret = lseek(tdb->fd, 0, SEEK_SET);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "lseek failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
                 }
         }