s3: Pass down lock_order to db_open_ctdb

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 0acaf67a31d97ca7c869a2e9a7c15729b9f02a0f..e5c07f4b8e7bccf005c0a81a95556df297e63956 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1431,7 +1431,8 @@ static int db_ctdb_get_flags(struct db_context *db)
 struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                                const char *name,
                                int hash_size, int tdb_flags,
-                               int open_flags, mode_t mode)
+                               int open_flags, mode_t mode,
+                               enum dbwrap_lock_order lock_order)
 {
        struct db_context *result;
        struct db_ctdb_ctx *db_ctdb;
@@ -1528,7 +1529,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                                const char *name,
                                int hash_size, int tdb_flags,
-                               int open_flags, mode_t mode)
+                               int open_flags, mode_t mode,
+                               enum dbwrap_lock_order lock_order)
 {
        DEBUG(3, ("db_open_ctdb: no cluster support!\n"));
        return NULL;

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.h b/source3/lib/dbwrap/dbwrap_ctdb.h
index 7898818ae464668f4ea319542ea2f25474ee718d..bfbe3bde52ef52861cf8a088a3939fa1462504e6 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.h
+++ b/source3/lib/dbwrap/dbwrap_ctdb.h
@@ -23,11 +23,14 @@
 
 #include <talloc.h>
 
+#include "dbwrap/dbwrap_private.h"
+
 struct db_context;
 
 struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                                const char *name,
                                int hash_size, int tdb_flags,
-                               int open_flags, mode_t mode);
+                               int open_flags, mode_t mode,
+                               enum dbwrap_lock_order lock_order);
 
 #endif /* __DBWRAP_CTDB_H__ */

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index af24ed884741264fae1561b167490ca18aa37566..731529680e454a1b6f53069a388b6efdd1a192ba 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -106,7 +106,8 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
                /* allow ctdb for individual databases to be disabled */
                if (lp_parm_bool(-1, "ctdb", partname, True)) {
                        result = db_open_ctdb(mem_ctx, partname, hash_size,
-                                             tdb_flags, open_flags, mode);
+                                             tdb_flags, open_flags, mode,
+                                             lock_order);
                        if (result == NULL) {
                                DEBUG(0,("failed to attach to ctdb %s\n",
                                         partname));