Changeset 905 for trunk/server/lib/tdb/common/open.c

Timestamp:

May 19, 2016, 2:25:59 PM (9 years ago)

Author:

dmik

Message:

tdb: Revert open/lock code to vendor.

This effectively reverts r895, r896 and many earlier commits that would
all attempt to solve the issues with file advisory locking provided by
fcntl() and used to serialize access to TDB files in Samba. All these
issues are to be solved by a proper fcntl() lock implementation provided
now by the new libcx library (​https://github.com/bitwiseworks/libcx).

With the current version of libcx tdbtorture works flawlessly for
-n > 1 (it may run out of memory returning ENOLCK but that's a separate
issue that will be solved soon).

File:

• trunk/server/lib/tdb/common/open.c (modified) (8 diffs)

trunk/server/lib/tdb/common/open.c

@@ -1 @@
- /*
+ /* 
    Unix SMB/CIFS implementation.
 
@@ -120 +120 @@
 }
 
-/* open the database, creating it if necessary
+/* open the database, creating it if necessary 
 
    The open_flags and mode are passed straight to the open call on the
@@ -126 +126 @@
    is advisory, use zero for a default value.
 
-   Return is NULL on error, in which case errno is also set.  Don't
+   Return is NULL on error, in which case errno is also set.  Don't 
    try to call tdb_error or tdb_errname, just do strerror(errno).
 
@@ -162 +162 @@
         return check_header_hash(tdb, false, m1, m2);
 }
-
-#ifdef __OS2__
-static int os2_create_lockfile(struct tdb_context *tdb, const char *name, const char *origin)
-{
-        /* name could be null, so handle it */
-        if (name == NULL)
-                return 0;
-
-        char lock_name[_MAX_PATH + 5];
-        snprintf(lock_name, sizeof(lock_name), "%s.lock", name);
-        /*
-         * First try to O_TRUNC it to make sure the file is empty (this
-         * will succeed on first open), but ignore the error that will
-         * happen if some bytes are already locked.
-         */
-        tdb->lock_fd = open(lock_name, tdb->open_flags | O_CREAT | O_TRUNC, 0777);
-        if (tdb->lock_fd == -1 && errno == EACCES)
-                tdb->lock_fd = open(lock_name, tdb->open_flags | O_CREAT, 0777);
-        if (tdb->lock_fd == -1) {
-                TDB_LOG((tdb, TDB_DEBUG_ERROR, "os2_create_lockfile: cannot create lock file %s, errno=%d\n",
-                         lock_name, errno));
-                return -1;
-        }
-
-        return 0;
-}
-#endif
 
 _PUBLIC_ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
@@ -333 +306 @@
         fcntl(tdb->fd, F_SETFD, v | FD_CLOEXEC);
 
-#ifdef __OS2__
-        if (os2_create_lockfile(tdb, name, "tdb_open_ex") != 0)
-                goto fail;
-#endif
-
         /* ensure there is only one process initialising at once */
         if (tdb_nest_lock(tdb, OPEN_LOCK, F_WRLCK, TDB_LOCK_WAIT) == -1) {
@@ -505 +473 @@
         { int save_errno = errno;
 
-#ifdef __OS2__
-        close(tdb->lock_fd);
-        tdb->lock_fd = -1;
-#endif
         if (!tdb)
                 return NULL;
@@ -577 +541 @@
         }
 
-#ifdef __OS2__
-        close(tdb->lock_fd);
-        tdb->lock_fd = -1;
-#endif
-
 #ifdef TDB_TRACE
         close(tdb->tracefd);
@@ -649 +608 @@
 #endif /* fake pread or pwrite */
 
-#ifdef __OS2__
-        close(tdb->lock_fd);
-        tdb->lock_fd = -1;
-
-        if (os2_create_lockfile(tdb, tdb->name, "tdb_reopen") != 0)
-                goto fail;
-#endif
         /* We may still think we hold the active lock. */
         tdb->num_lockrecs = 0;