Skip to contentSkip to conversation

syscalls/fcntl33.c: fix test for fuse fs again

PATCH New Alexey Kodanev 2 participants 3 messages Apr 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 syscalls/fcntl33.c: fix test for fuse fs again

The previous fix commit 7703cb3e10ea ("syscall/fcntl33.c: fix test on FUSE fs") moved open() (can sleep on fuse fs) before fork()/do_child(). But the fix was removed by commit e5c990c5c55b ("Convert fcntl33 to newlib").

In this patch, instead of moving open(), use LTP checkpoints: wake the child only after setting the lease in a parent process.

---
 testcases/kernel/syscalls/fcntl/fcntl33.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
testcases/kernel/syscalls/fcntl/fcntl33.c +3 -1
index 35eebb5..43dc5a2 100644
@@ -124,6 +124,7 @@ static void do_test(unsigned int i)
 		goto exit;
 	}
 
+	TST_CHECKPOINT_WAKE(0);
 	/* Wait for SIGIO caused by lease breaker. */
 	TEST(sigtimedwait(&newset, NULL, &timeout));
 	if (TST_RET == -1) {
@@ -174,7 +175,7 @@ static void do_child(unsigned int i)
 {
 	long long elapsed_ms;
 
-	TST_PROCESS_STATE_WAIT(getppid(), 'S');
+	TST_CHECKPOINT_WAIT(0);
 
 	tst_timer_start(CLOCK_MONOTONIC);
 
@@ -225,6 +226,7 @@ static struct tst_test test = {
 	.forks_child = 1,
 	.needs_root = 1,
 	.needs_tmpdir = 1,
+	.needs_checkpoints = 1,
 	.tcnt = ARRAY_SIZE(test_cases),
 	.setup = setup,
 	.test = do_test,
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 syscalls/fcntl33.c: fix test for fuse fs again

Hi!

Quoted 6 lines

The previous fix commit 7703cb3e10ea ("syscall/fcntl33.c: fix test on FUSE fs") moved open() (can sleep on fuse fs) before fork()/do_child(). But the fix was removed by commit e5c990c5c55b ("Convert fcntl33 to newlib").

In this patch, instead of moving open(), use LTP checkpoints: wake the child only after setting the lease in a parent process.

Looks good to me, acked.

Signature · 2 lines
Cyril Hrubis
[email protected]
author Applied
#2 lore raw

PATCH 1/1 syscalls/fcntl33.c: fix test for fuse fs again

Hi Cyril,

Quoted 9 lines · Cyril Hrubis

Hi!

Quoted 6 lines

The previous fix commit 7703cb3e10ea ("syscall/fcntl33.c: fix test on FUSE fs") moved open() (can sleep on fuse fs) before fork()/do_child(). But the fix was removed by commit e5c990c5c55b ("Convert fcntl33 to newlib").

In this patch, instead of moving open(), use LTP checkpoints: wake the child only after setting the lease in a parent process.

Looks good to me, acked.

Thanks for review!

Applied.