From 68559b787e7c9a83e055493bde638ec02e1097d1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 14 Feb 2013 16:10:31 +0100 Subject: tdb: Enhance lock tracking a bit lock-tracking.c mirrors the in-kernel fcntl structures to detect unexpected use of fcntl calls. During my mutex work I changed our fcntl use so that we unlock the allrecord_lock in two pieces: The range covering the hash locks and the range covering the data area for the individual traverse record locks. Splitting locks is not covered by lock-tracking.c. This patch extends lock-tracking.c with this little piece. It's still far from complete to track the full range of fcntl semantics. It is not strictly needed right now, but it does not hurt either. Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- lib/tdb/test/lock-tracking.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/tdb') diff --git a/lib/tdb/test/lock-tracking.c b/lib/tdb/test/lock-tracking.c index 90a07f8ef1..b2f092c0c4 100644 --- a/lib/tdb/test/lock-tracking.c +++ b/lib/tdb/test/lock-tracking.c @@ -65,6 +65,17 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ ) } break; } + if (((*l)->off == fl->l_start) + && ((*l)->len == 0) + && (ret == 0)) { + /* + * Remove a piece from the start of the + * allrecord_lock + */ + old = *l; + (*l)->off += fl->l_len; + break; + } } if (!old && !suppress_lockcheck) { diag("Unknown unlock %u@%u - %i", -- cgit