From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 30 Aug 2010 01:11:57 +0000 (+0930)
Subject: tdb: fix lock-tracking test code after gradual lock changes.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=64eca8b85ef0bd13d72381b6c70110e4c342339b

tdb: fix lock-tracking test code after gradual lock changes.
---

diff --git a/ccan/tdb/test/lock-tracking.c b/ccan/tdb/test/lock-tracking.c
index 8c0c86c9..8460c048 100644
--- a/ccan/tdb/test/lock-tracking.c
+++ b/ccan/tdb/test/lock-tracking.c
@@ -70,6 +70,12 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ )
 				break;
 			if (fl_end >= i->off && fl_end < i_end)
 				break;
+
+			/* tdb_allrecord_lock does this, handle adjacent: */
+			if (fl->l_start == i_end && fl->l_type == i->type) {
+				i->len = fl->l_len ? i->len + fl->l_len : 0;
+				goto ok;
+			}
 		}
 		if (i) {
 			/* Special case: upgrade of allrecord lock. */