From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 1 Mar 2011 00:52:56 +0000 (+1030)
Subject: failtest: fix locking code.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=9975a26bad25cdefaefb52705fed76b0baae9ec5

failtest: fix locking code.

We need to get the locks back *after* the child runs.
---

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 7d842d80..e2e6c64f 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -983,7 +983,6 @@ int failtest_fcntl(int fd, const char *file, unsigned line, int cmd, ...)
 	}
 
 	p = add_history(FAILTEST_FCNTL, file, line, &call);
-	get_locks();
 
 	if (should_fail(p)) {
 		p->u.fcntl.ret = -1;
@@ -992,6 +991,7 @@ int failtest_fcntl(int fd, const char *file, unsigned line, int cmd, ...)
 		else
 			p->error = EDEADLK;
 	} else {
+		get_locks();
 		p->u.fcntl.ret = fcntl(p->u.fcntl.fd, p->u.fcntl.cmd,
 				       &p->u.fcntl.arg.fl);
 		if (p->u.fcntl.ret == -1)