summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-09-14 07:30:13 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-09-14 07:30:13 +0930
commita14df0f361bfb1dbe25abf9b7b129e99ee6a516f (patch)
treee227a72fd09266a093103a96ded5adb57b58db7a
parentf6eee4216f35eced3314e6aeafba4c65872def99 (diff)
downloadsamba-a14df0f361bfb1dbe25abf9b7b129e99ee6a516f.tar.gz
samba-a14df0f361bfb1dbe25abf9b7b129e99ee6a516f.tar.bz2
samba-a14df0f361bfb1dbe25abf9b7b129e99ee6a516f.zip
tdb2: rearrange tdb_context layout so tdb1_context can match
By moving all the parts of struct tdb_context which logging and locking use to the beginning of the structure, we can make tdb1_context match, and thus pass that directly to the tdb_logerr() function, and later the locking functions. This is only necessary until we unify tdb1_context and tdb_context. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit 0fd5be2955f8e6487c0f4ab711e2a6958bb8f412)
-rw-r--r--lib/tdb2/private.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 7c051121d7..fd848cf65b 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -340,15 +340,6 @@ struct tdb_context {
/* Filename of the database. */
const char *name;
- /* Are we accessing directly? (debugging check). */
- int direct_access;
-
- /* Open flags passed to tdb_open. */
- int open_flags;
-
- /* the flags passed to tdb_open, for tdb_reopen. */
- uint32_t flags;
-
/* Logging function */
void (*log_fn)(struct tdb_context *tdb,
enum tdb_log_level level,
@@ -357,16 +348,28 @@ struct tdb_context {
void *data);
void *log_data;
- /* Hash function. */
- uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
- void *hash_data;
- uint64_t hash_seed;
+ /* Open flags passed to tdb_open. */
+ int open_flags;
/* low level (fnctl) lock functions. */
int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
void *lock_data;
+ /* the flags passed to tdb_open. */
+ uint32_t flags;
+
+ /* Our statistics. */
+ struct tdb_attribute_stats stats;
+
+ /* Are we accessing directly? (debugging check). */
+ int direct_access;
+
+ /* Hash function. */
+ uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
+ void *hash_data;
+ uint64_t hash_seed;
+
/* Set if we are in a transaction. */
struct tdb_transaction *transaction;
@@ -381,9 +384,6 @@ struct tdb_context {
/* IO methods: changes for transactions. */
const struct tdb_methods *methods;
- /* Our statistics. */
- struct tdb_attribute_stats stats;
-
/* Direct access information */
struct tdb_access_hdr *access;