Commit 5730f817 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

zdtm: fanotify00 -- Use exit instead of fail until test_daemon call

As Andrew pointed the logically it's more correct to use
err() instead of fail() if test_daemon() has not been
used.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
CC: Andrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 3f3498bc
...@@ -53,27 +53,27 @@ int main (int argc, char *argv[]) ...@@ -53,27 +53,27 @@ int main (int argc, char *argv[])
FAN_CLASS_NOTIF | FAN_UNLIMITED_QUEUE, FAN_CLASS_NOTIF | FAN_UNLIMITED_QUEUE,
0); 0);
if (fa_fd < 0) { if (fa_fd < 0) {
fail("fanotify_init failed\n"); err("fanotify_init failed\n");
exit(1); exit(1);
} }
del_after = open(fanotify_path, O_CREAT | O_TRUNC); del_after = open(fanotify_path, O_CREAT | O_TRUNC);
if (del_after < 0) { if (del_after < 0) {
fail("open failed\n"); err("open failed\n");
exit(1); exit(1);
} }
if (fanotify_mark(fa_fd, FAN_MARK_ADD, if (fanotify_mark(fa_fd, FAN_MARK_ADD,
FAN_MODIFY | FAN_ACCESS | FAN_OPEN | FAN_CLOSE, FAN_MODIFY | FAN_ACCESS | FAN_OPEN | FAN_CLOSE,
AT_FDCWD, fanotify_path)) { AT_FDCWD, fanotify_path)) {
fail("fanotify_mark failed\n"); err("fanotify_mark failed\n");
exit(1); exit(1);
} }
if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT, if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT,
FAN_ONDIR | FAN_OPEN | FAN_CLOSE, FAN_ONDIR | FAN_OPEN | FAN_CLOSE,
AT_FDCWD, "/")) { AT_FDCWD, "/")) {
fail("fanotify_mark failed\n"); err("fanotify_mark failed\n");
exit(1); exit(1);
} }
...@@ -81,7 +81,7 @@ int main (int argc, char *argv[]) ...@@ -81,7 +81,7 @@ int main (int argc, char *argv[])
FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY, FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY,
FAN_MODIFY | FAN_ACCESS, FAN_MODIFY | FAN_ACCESS,
AT_FDCWD, "/")) { AT_FDCWD, "/")) {
fail("fanotify_mark failed\n"); err("fanotify_mark failed\n");
exit(1); exit(1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment