Attachment 10437 Details for Bug 10922 – Patch for v4-2-test

[patch] Patch for v4-2-test

tmp42.diff (text/plain), 1.35 KB, created by Stefan Metzmacher on 2014-11-19 09:34:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-11-19 09:34:01 UTC

Size: 1.35 KB

patch

obsolete

>From 8fee18c6618b00a15221972da6c182b7f75cd2eb Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 6 Nov 2014 11:59:34 +0100
>Subject: [PATCH] dbwrap_ctdb: Pass on mutex flags to tdb_open
>
>Without this, ctdb can create a tdb file with mutex activated, but the
>local tdb_open will not open the tdb due to strict flags checks whether
>mutexes are possible.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10922
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Sun Nov 16 12:13:54 CET 2014 on sn-devel-104
>
>(cherry picked from commit 1106ede280938d05325baa146bd524aa3568deaf)
>---
> source3/lib/dbwrap/dbwrap_ctdb.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
>index 2aee435..e6dcc0e 100644
>--- a/source3/lib/dbwrap/dbwrap_ctdb.c
>+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
>@@ -1607,7 +1607,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
> 	result->lock_order = lock_order;
> 
> 	/* only pass through specific flags */
>-	tdb_flags &= TDB_SEQNUM|TDB_VOLATILE;
>+	tdb_flags &= TDB_SEQNUM|TDB_VOLATILE|
>+		TDB_MUTEX_LOCKING|TDB_CLEAR_IF_FIRST;
> 
> 	/* honor permissions if user has specified O_CREAT */
> 	if (open_flags & O_CREAT) {
>-- 
>1.9.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 10922: 10414 | 10437