Attachment 3468 Details for Bug 5684 – proposed patch

[patch] proposed patch

0001-Attempt-to-fix-bug-5684.patch (text/plain), 1.22 KB, created by Volker Lendecke on 2008-08-12 15:36:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2008-08-12 15:36:50 UTC

Size: 1.22 KB

patch

obsolete

>From 8c39d513682795b35dbd35de8c50a83fa611ee24 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 12 Aug 2008 22:31:52 +0200
>Subject: [PATCH] Attempt to fix bug 5684
>
>With the ctdb checkin dde9f3f006 tdb optimized out write lock checks for
>write-enabled transaction. Sadly, this also removed the possibility to ever
>remove dead records left over from tdb_delete calls within a transaction.
>
>Tridge, please check this! Did dde9f3f006 have any reason beyond performance
>optimizations?
>
>Thanks to Joachim Reichelt <Joachim.Reichelt@helmholtz-hzi.de> for reporting it!
>
>Volker
>---
> source/lib/tdb/common/tdb.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/source/lib/tdb/common/tdb.c b/source/lib/tdb/common/tdb.c
>index 767452c..c7cec29 100644
>--- a/source/lib/tdb/common/tdb.c
>+++ b/source/lib/tdb/common/tdb.c
>@@ -243,7 +243,7 @@ int tdb_do_delete(struct tdb_context *tdb, tdb_off_t rec_ptr, struct list_struct
> 
> 	if (tdb->read_only || tdb->traverse_read) return -1;
> 
>-	if (tdb->traverse_write != 0 || 
>+	if (((tdb->traverse_write != 0) && (!TDB_DEAD(rec))) ||
> 	    tdb_write_lock_record(tdb, rec_ptr) == -1) {
> 		/* Someone traversing here: mark it as dead */
> 		rec->magic = TDB_DEAD_MAGIC;
>-- 
>1.5.5
>

Actions: View

Attachments on bug 5684: 3468