[COMMITTED,4/7] syscalls/inotify04: Fix cleanup
diff mbox series

Message ID 20180302154841.4093-4-chrubis@suse.cz
State Accepted
Headers show
Series
  • Untitled series #31562
Related show

Commit Message

Cyril Hrubis March 2, 2018, 3:48 p.m. UTC
The cleanup attempted to close() the inotify watch descriptors however
these are _NOT_ file descriptors and are allocated from completely
distinct space.

So in this case the inotify watch descriptors we got were 1 and 2 so we
closed the stdout and stderr at the end of the test which still made the
test pass without any error just by a chance.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/inotify/inotify04.c | 7 -------
 1 file changed, 7 deletions(-)

Patch
diff mbox series

diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c
index b78277c13..e7f862026 100644
--- a/testcases/kernel/syscalls/inotify/inotify04.c
+++ b/testcases/kernel/syscalls/inotify/inotify04.c
@@ -81,7 +81,6 @@  static struct tst_kern_exv kvers[] = {
 
 static void cleanup(void)
 {
-
 	if (reap_wd_dir && myinotify_rm_watch(fd_notify, wd_dir) == -1)
 		tst_res(TWARN,
 			"inotify_rm_watch(%d, %d) [1] failed", fd_notify,
@@ -94,12 +93,6 @@  static void cleanup(void)
 
 	if (fd_notify > 0 && close(fd_notify))
 		tst_res(TWARN, "close(%d) [1] failed", fd_notify);
-
-	if (wd_dir > 0 && close(wd_dir))
-		tst_res(TWARN, "close(%d) [2] failed", wd_dir);
-
-	if (wd_file > 0 && close(wd_file))
-		tst_res(TWARN, "close(%d) [3] failed", wd_file);
 }
 
 static void setup(void)