From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 27 May 2007 17:12:08 +0000 (+0000)
Subject: r23169: Merge 535 of Tridge's bzr tree:
X-Git-Tag: samba-4.0.0alpha6~801^2~5767
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c57860cc79f37296785b4f7ae67fd5a8a543e39;p=thirdparty%2Fsamba.git

r23169: Merge 535 of Tridge's bzr tree:

  store the right data after cleaning lock records. This fixes
  RAW-BENCH-LOCK after a recovery on a cluster
(This used to be commit 3da3086dbf594fbdc4cfabf78f8d3ea1df4dc8ce)
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index d8dcc6f642a..8e2f7ce41a6 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1482,8 +1482,11 @@ static int traverse_fn(struct db_record *rec, void *state)
 	}
 
 	if (orig_num_locks != num_locks) {
-		if (rec->value.dsize) {
-			rec->store(rec, rec->value, TDB_REPLACE);
+		if (num_locks) {
+			TDB_DATA data;
+			data.dptr = (uint8_t *)locks;
+			data.dsize = num_locks*sizeof(struct lock_struct);
+			rec->store(rec, data, TDB_REPLACE);
 		} else {
 			rec->delete_rec(rec);
 		}