Changeset 165 for branches/samba-3.0/source/tdb/common

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

Location:

branches/samba-3.0/source/tdb/common

Files:

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

branches/samba-3.0/source/tdb/common/io.c

@@ -101 +101 @@
         if (tdb->map_ptr) {
                 memcpy(off + (char *)tdb->map_ptr, buf, len);
-        } else if (pwrite(tdb->fd, buf, len, off) != (ssize_t)len) {
-                /* Ensure ecode is set for log fn. */
-                tdb->ecode = TDB_ERR_IO;
-                TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d len=%d (%s)\n",
-                           off, len, strerror(errno)));
-        } else {
-                ssize_t written = pwrite(tdb->fd, buf, len, off);
-                if ((written != (ssize_t)len) && (written != -1)) {
-                        /* try once more */
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: wrote only "
-                                 "%d of %d bytes at %d, trying once more\n",
+        } else {
+                ssize_t written = pwrite(tdb->fd, buf, len, off);
+                if ((written != (ssize_t)len) && (written != -1)) {
+                        /* try once more */
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: wrote only "
+                                 "%d of %d bytes at %d, trying once more\n",
                                  (uint32_t)written, len, off));
-                        errno = ENOSPC;
-                        written = pwrite(tdb->fd, (void *)((char *)buf+written),
-                                         len-written,
-                                         off+written);
-                }
-                if (written == -1) {
-                        /* Ensure ecode is set for log fn. */
-                        tdb->ecode = TDB_ERR_IO;
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d "
-                                 "len=%d (%s)\n", off, len, strerror(errno)));
-                        return TDB_ERRCODE(TDB_ERR_IO, -1);
-                } else if (written != (ssize_t)len) {
-                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: failed to "
-                                 "write %d bytes at %d in two attempts\n",
-                                 len, off));
-                        errno = ENOSPC;
+                        errno = ENOSPC;
+                        written = pwrite(tdb->fd, (void *)((char *)buf+written),
+                                         len-written,
+                                         off+written);
+                }
+                if (written == -1) {
+                        /* Ensure ecode is set for log fn. */
+                        tdb->ecode = TDB_ERR_IO;
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d "
+                                 "len=%d (%s)\n", off, len, strerror(errno)));
+                        return TDB_ERRCODE(TDB_ERR_IO, -1);
+                } else if (written != (ssize_t)len) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_write: failed to "
+                                 "write %d bytes at %d in two attempts\n",
+                                 len, off));
+                        errno = ENOSPC;
 #ifdef __OS2__
                 // remove our lock
@@ -215 +210 @@
 #ifdef HAVE_MMAP
         if (tdb->map_ptr) {
-                int ret = munmap(tdb->map_ptr, tdb->map_size);
+                int ret;
+
+                ret = munmap(tdb->map_ptr, tdb->map_size);
                 if (ret != 0)
                         return ret;

branches/samba-3.0/source/tdb/common/open.c

@@ -364 +364 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
+#ifndef __OS2__
+        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
+                goto fail;
+#endif
         tdb->next = tdbs;
         tdbs = tdb;
@@ -370 +374 @@
  fail:
         { int save_errno = errno;
-        tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
         if (!tdb)
@@ -555 +558 @@
         if ((tdb->flags & TDB_CLEAR_IF_FIRST) && 
             (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_RDLCK, F_SETLKW, 0, 1) == -1)) {
-// YD sem handle was wrong, testme #ifndef __OS2__ // PS 20070511 hack for WINS server crash
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_reopen: failed to obtain active lock\n"));
                 goto fail;
-//#endif
         }
         if (fstat(tdb->fd, &st) != 0) {

branches/samba-3.0/source/tdb/common/transaction.c

@@ -558 +558 @@
                 return -1;
         }
-#ifdef MS_SYNC
+#ifdef HAVE_MMAP
         if (tdb->map_ptr) {
                 tdb_off_t moffset = offset & ~(tdb->page_size-1);