diff options
| -rw-r--r-- | source4/lib/tdb/Makefile.tdb | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/common/spinlock.c | 26 | ||||
| -rw-r--r-- | source4/lib/tdb/common/tdb.c | 3 | ||||
| -rw-r--r-- | source4/lib/tdb/include/spinlock.h | 4 |
4 files changed, 18 insertions, 17 deletions
diff --git a/source4/lib/tdb/Makefile.tdb b/source4/lib/tdb/Makefile.tdb index db697e9379..35e208256c 100644 --- a/source4/lib/tdb/Makefile.tdb +++ b/source4/lib/tdb/Makefile.tdb @@ -26,4 +26,4 @@ bin/tdbbackup: tools/tdbbackup.o $(TDB_OBJ) $(CC) $(CFLAGS) -o tdbbackup tools/tdbbackup.o $(TDB_OBJ) clean: - rm -f $(PROGS) common/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm + rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm diff --git a/source4/lib/tdb/common/spinlock.c b/source4/lib/tdb/common/spinlock.c index ee3eff1b31..27481e221c 100644 --- a/source4/lib/tdb/common/spinlock.c +++ b/source4/lib/tdb/common/spinlock.c @@ -55,7 +55,7 @@ static inline int __spin_trylock(spinlock_t *lock) { - uint_t result; + unsigned int result; asm volatile("ldstub [%1], %0" : "=r" (result) @@ -85,7 +85,7 @@ static inline int __spin_is_locked(spinlock_t *lock) static inline int __spin_trylock(spinlock_t *lock) { - uint_t result; + unsigned int result; __asm__ __volatile__( "1: lwarx %0,0,%1\n\ @@ -167,7 +167,7 @@ static inline int __spin_is_locked(spinlock_t *lock) /* Returns 0 if the lock is acquired, EBUSY otherwise. */ static inline int __spin_trylock(spinlock_t *lock) { - uint_t val; + unsigned int val; val = __lock_test_and_set(lock, 1); return val == 0 ? 0 : EBUSY; } @@ -185,16 +185,16 @@ static inline void __spin_lock_init(spinlock_t *lock) /* Returns 1 if the lock is held, 0 otherwise. */ static inline int __spin_is_locked(spinlock_t *lock) { - uint_t val; + unsigned int val; val = __add_and_fetch(lock, 0); return val; } #elif defined(MIPS_SPINLOCKS) -static inline uint_t load_linked(unsigned long addr) +static inline unsigned int load_linked(unsigned long addr) { - uint_t res; + unsigned int res; __asm__ __volatile__("ll\t%0,(%1)" : "=r" (res) @@ -203,9 +203,9 @@ static inline uint_t load_linked(unsigned long addr) return res; } -static inline uint_t store_conditional(unsigned long addr, uint_t value) +static inline unsigned int store_conditional(unsigned long addr, unsigned int value) { - uint_t res; + unsigned int res; __asm__ __volatile__("sc\t%0,(%2)" : "=r" (res) @@ -215,7 +215,7 @@ static inline uint_t store_conditional(unsigned long addr, uint_t value) static inline int __spin_trylock(spinlock_t *lock) { - uint_t mw; + unsigned int mw; do { mw = load_linked(lock); @@ -418,9 +418,9 @@ int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type) return 0; } -int tdb_create_rwlocks(int fd, uint_t hash_size) +int tdb_create_rwlocks(int fd, unsigned int hash_size) { - uint_t size, i; + unsigned int size, i; tdb_rwlock_t *rwlocks; size = TDB_SPINLOCK_SIZE(hash_size); @@ -446,7 +446,7 @@ int tdb_create_rwlocks(int fd, uint_t hash_size) int tdb_clear_spinlocks(TDB_CONTEXT *tdb) { tdb_rwlock_t *rwlocks; - uint_t i; + unsigned int i; if (tdb->header.rwlocks == 0) return 0; if (!tdb->map_ptr) return -1; @@ -460,7 +460,7 @@ int tdb_clear_spinlocks(TDB_CONTEXT *tdb) return 0; } #else -int tdb_create_rwlocks(int fd, uint_t hash_size) { return 0; } +int tdb_create_rwlocks(int fd, unsigned int hash_size) { return 0; } int tdb_spinlock(TDB_CONTEXT *tdb, int list, int rw_type) { return -1; } int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type) { return -1; } diff --git a/source4/lib/tdb/common/tdb.c b/source4/lib/tdb/common/tdb.c index d4c0928217..ef13955fab 100644 --- a/source4/lib/tdb/common/tdb.c +++ b/source4/lib/tdb/common/tdb.c @@ -53,6 +53,7 @@ #include <stdlib.h> #include <stdio.h> +#include <stdint.h> #include <fcntl.h> #include <unistd.h> #include <string.h> @@ -541,7 +542,7 @@ static tdb_off tdb_dump_record(TDB_CONTEXT *tdb, tdb_off offset) if (tailer != rec.rec_len + sizeof(rec)) { printf("ERROR: tailer does not match record! tailer=%u totalsize=%u\n", - (uint_t)tailer, (uint_t)(rec.rec_len + sizeof(rec))); + (unsigned int)tailer, (unsigned int)(rec.rec_len + sizeof(rec))); } return rec.next; } diff --git a/source4/lib/tdb/include/spinlock.h b/source4/lib/tdb/include/spinlock.h index 1255d455de..967fe37457 100644 --- a/source4/lib/tdb/include/spinlock.h +++ b/source4/lib/tdb/include/spinlock.h @@ -36,7 +36,7 @@ typedef struct { int tdb_spinlock(TDB_CONTEXT *tdb, int list, int rw_type); int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type); -int tdb_create_rwlocks(int fd, uint_t hash_size); +int tdb_create_rwlocks(int fd, unsigned int hash_size); int tdb_clear_spinlocks(TDB_CONTEXT *tdb); #define TDB_SPINLOCK_SIZE(hash_size) (((hash_size) + 1) * sizeof(tdb_rwlock_t)) @@ -49,7 +49,7 @@ int tdb_clear_spinlocks(TDB_CONTEXT *tdb); #else int tdb_spinlock(TDB_CONTEXT *tdb, int list, int rw_type); int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type); -int tdb_create_rwlocks(int fd, uint_t hash_size); +int tdb_create_rwlocks(int fd, unsigned int hash_size); #endif int tdb_clear_spinlocks(TDB_CONTEXT *tdb); #define TDB_SPINLOCK_SIZE(hash_size) 0 |