diff options
Diffstat (limited to 'source3/tdb/tdb.c')
| -rw-r--r-- | source3/tdb/tdb.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index 5bb75ffe07..ed75a55e3e 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -34,7 +34,6 @@ #include <errno.h> #include <sys/mman.h> #include <sys/stat.h> -#include <signal.h> #include "tdb.h" #include "spinlock.h" #else @@ -161,18 +160,6 @@ struct list_struct { */ }; -/*************************************************************** - Allow a caller to set a "alarm" flag that tdb can check to abort - a blocking lock on SIGALRM. -***************************************************************/ - -static sig_atomic_t *palarm_fired; - -void tdb_set_lock_alarm(sig_atomic_t *palarm) -{ - palarm_fired = palarm; -} - /* a byte range locking function - return 0 on success this functions locks/unlocks 1 byte at the specified offset. @@ -199,8 +186,6 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset, do { ret = fcntl(tdb->fd,lck_type,&fl); - if (ret == -1 && errno == EINTR && palarm_fired && *palarm_fired) - break; } while (ret == -1 && errno == EINTR); if (ret == -1) { @@ -532,20 +517,17 @@ int tdb_printfreelist(TDB_CONTEXT *tdb) /* read in the freelist top */ if (ofs_read(tdb, offset, &rec_ptr) == -1) { - tdb_unlock(tdb, -1, F_WRLCK); return 0; } printf("freelist top=[0x%08x]\n", rec_ptr ); while (rec_ptr) { if (tdb_read(tdb, rec_ptr, (char *)&rec, sizeof(rec), DOCONV()) == -1) { - tdb_unlock(tdb, -1, F_WRLCK); return -1; } if (rec.magic != TDB_FREE_MAGIC) { printf("bad magic 0x%08x in free list\n", rec.magic); - tdb_unlock(tdb, -1, F_WRLCK); return -1; } |