[LTP] [PATCH] inotify: cleanup - limit masks, use SAFE_ wrappers
Jinseok Kim
always.starving0@gmail.com
Sat Feb 14 18:52:37 CET 2026
Replace IN_ALL_EVENTS with minimal relevant masks and manual read/write
with SAFE_READ/SAFE_WRITE for better stability and consistency.
inotify12.c intentionally unchanged: raw read() + manual EAGAIN handling
is required to treat missing second event as IN_IGNORED (normal case).
Signed-off-by: Jinseok Kim <always.starving0@gmail.com>
---
testcases/kernel/syscalls/inotify/inotify01.c | 21 ++++++-------------
testcases/kernel/syscalls/inotify/inotify02.c | 5 ++++-
testcases/kernel/syscalls/inotify/inotify03.c | 16 +++-----------
testcases/kernel/syscalls/inotify/inotify04.c | 10 ++++-----
testcases/kernel/syscalls/inotify/inotify05.c | 10 +++------
testcases/kernel/syscalls/inotify/inotify07.c | 10 +++------
testcases/kernel/syscalls/inotify/inotify08.c | 7 +------
testcases/kernel/syscalls/inotify/inotify10.c | 4 +---
8 files changed, 26 insertions(+), 57 deletions(-)
diff --git a/testcases/kernel/syscalls/inotify/inotify01.c b/testcases/kernel/syscalls/inotify/inotify01.c
index 8671b594a..f58784ffd 100644
--- a/testcases/kernel/syscalls/inotify/inotify01.c
+++ b/testcases/kernel/syscalls/inotify/inotify01.c
@@ -55,10 +55,7 @@ void verify_inotify(void)
event_set[test_cnt] = IN_OPEN;
test_cnt++;
- if (read(fd, buf, BUF_SIZE) == -1) {
- tst_brk(TBROK | TERRNO,
- "read(%d, buf, %d) failed", fd, BUF_SIZE);
- }
+ SAFE_READ(0, fd, buf, BUF_SIZE);
event_set[test_cnt] = IN_ACCESS;
test_cnt++;
@@ -70,10 +67,7 @@ void verify_inotify(void)
event_set[test_cnt] = IN_OPEN;
test_cnt++;
- if (write(fd, buf, BUF_SIZE) == -1) {
- tst_brk(TBROK,
- "write(%d, %s, %d) failed", fd, fname, BUF_SIZE);
- }
+ SAFE_WRITE(SAFE_WRITE_ALL, fd, buf, BUF_SIZE);
event_set[test_cnt] = IN_MODIFY;
test_cnt++;
@@ -85,12 +79,7 @@ void verify_inotify(void)
* get list of events
*/
int len, i = 0, test_num = 0;
- if ((len = read(fd_notify, event_buf, EVENT_BUF_LEN)) < 0) {
- tst_brk(TBROK,
- "read(%d, buf, %zu) failed",
- fd_notify, EVENT_BUF_LEN);
-
- }
+ len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
/*
* check events
@@ -143,7 +132,9 @@ static void setup(void)
fd_notify = SAFE_MYINOTIFY_INIT();
- wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_ALL_EVENTS);
+ wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_ATTRIB | IN_OPEN |
+ IN_ACCESS | IN_CLOSE_NOWRITE | IN_MODIFY |
+ IN_CLOSE_WRITE);
reap_wd = 1;
}
diff --git a/testcases/kernel/syscalls/inotify/inotify02.c b/testcases/kernel/syscalls/inotify/inotify02.c
index 314c1bd49..a842abeee 100644
--- a/testcases/kernel/syscalls/inotify/inotify02.c
+++ b/testcases/kernel/syscalls/inotify/inotify02.c
@@ -187,7 +187,10 @@ static void setup(void)
{
fd_notify = SAFE_MYINOTIFY_INIT();
- wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, ".", IN_ALL_EVENTS);
+ wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, ".", IN_ATTRIB | IN_CREATE |
+ IN_OPEN | IN_CLOSE_WRITE |
+ IN_MOVED_FROM | IN_MOVED_TO |
+ IN_MOVE_SELF | IN_DELETE);
reap_wd = 1;
}
diff --git a/testcases/kernel/syscalls/inotify/inotify03.c b/testcases/kernel/syscalls/inotify/inotify03.c
index 9bb95addb..5d141fbb5 100644
--- a/testcases/kernel/syscalls/inotify/inotify03.c
+++ b/testcases/kernel/syscalls/inotify/inotify03.c
@@ -55,7 +55,7 @@ void verify_inotify(void)
SAFE_MOUNT(tst_device->dev, mntpoint, tst_device->fs_type, 0, NULL);
mount_flag = 1;
- wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_ALL_EVENTS);
+ wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_UNMOUNT | IN_IGNORED);
event_set[test_cnt] = IN_UNMOUNT;
test_cnt++;
@@ -74,11 +74,7 @@ void verify_inotify(void)
}
mount_flag = 0;
- len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len < 0) {
- tst_brk(TBROK | TERRNO,
- "read(%d, buf, %zu) failed", fd_notify, EVENT_BUF_LEN);
- }
+ len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
/* check events */
test_num = 0;
@@ -125,8 +121,6 @@ void verify_inotify(void)
static void setup(void)
{
- int ret;
-
SAFE_MKDIR(mntpoint, DIR_MODE);
SAFE_MOUNT(tst_device->dev, mntpoint, tst_device->fs_type, 0, NULL);
@@ -135,11 +129,7 @@ static void setup(void)
sprintf(fname, "%s/tfile_%d", mntpoint, getpid());
fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0700);
- ret = write(fd, fname, 1);
- if (ret == -1) {
- tst_brk(TBROK | TERRNO,
- "write(%d, %s, 1) failed", fd, fname);
- }
+ SAFE_WRITE(SAFE_WRITE_ALL, fd, fname, 1);
/* close the file we have open */
SAFE_CLOSE(fd);
diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c
index 1db38ddf2..1472bcff0 100644
--- a/testcases/kernel/syscalls/inotify/inotify04.c
+++ b/testcases/kernel/syscalls/inotify/inotify04.c
@@ -81,10 +81,12 @@ void verify_inotify(void)
SAFE_MKDIR(TEST_DIR, 00700);
close(SAFE_CREAT(TEST_FILE, 00600));
- wd_dir = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, TEST_DIR, IN_ALL_EVENTS);
+ wd_dir = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, TEST_DIR, IN_DELETE_SELF |
+ IN_ATTRIB | IN_IGNORED);
reap_wd_dir = 1;
- wd_file = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, TEST_FILE, IN_ALL_EVENTS);
+ wd_file = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, TEST_FILE, IN_DELETE_SELF |
+ IN_ATTRIB | IN_IGNORED);
reap_wd_file = 1;
SAFE_RMDIR(TEST_DIR);
@@ -118,9 +120,7 @@ void verify_inotify(void)
strcpy(event_set[test_cnt].name, "");
test_cnt++;
- len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len == -1)
- tst_brk(TBROK | TERRNO, "read failed");
+ len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
while (i < len) {
struct inotify_event *event;
diff --git a/testcases/kernel/syscalls/inotify/inotify05.c b/testcases/kernel/syscalls/inotify/inotify05.c
index d9bfb05f1..d1e35b735 100644
--- a/testcases/kernel/syscalls/inotify/inotify05.c
+++ b/testcases/kernel/syscalls/inotify/inotify05.c
@@ -60,12 +60,7 @@ void verify_inotify(void)
/*
* get list on events
*/
- len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len < 0) {
- tst_brk(TBROK | TERRNO,
- "read(%d, buf, %zu) failed",
- fd_notify, EVENT_BUF_LEN);
- }
+ len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
/*
* check events
@@ -128,7 +123,8 @@ static void setup(void)
fd_notify = SAFE_MYINOTIFY_INIT1(O_NONBLOCK);
- wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_ALL_EVENTS);
+ wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, fname, IN_ACCESS | IN_MODIFY |
+ IN_OPEN | IN_Q_OVERFLOW);
SAFE_FILE_SCANF("/proc/sys/fs/inotify/max_queued_events",
"%d", &max_events);
diff --git a/testcases/kernel/syscalls/inotify/inotify07.c b/testcases/kernel/syscalls/inotify/inotify07.c
index 66a2f4d37..55d03377c 100644
--- a/testcases/kernel/syscalls/inotify/inotify07.c
+++ b/testcases/kernel/syscalls/inotify/inotify07.c
@@ -88,12 +88,7 @@ void verify_inotify(void)
strcpy(event_set[test_cnt].name, FILE_NAME);
test_cnt++;
- int len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len == -1 && errno != EAGAIN) {
- tst_brk(TBROK | TERRNO,
- "read(%d, buf, %zu) failed",
- fd_notify, EVENT_BUF_LEN);
- }
+ int len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
int i = 0, test_num = 0;
while (i < len) {
@@ -151,7 +146,8 @@ static void setup(void)
fd_notify = SAFE_MYINOTIFY_INIT1(O_NONBLOCK);
/* Setup a watch on an overlayfs lower directory */
- wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, DIR_PATH, IN_ALL_EVENTS);
+ wd = SAFE_MYINOTIFY_ADD_WATCH(fd_notify, DIR_PATH, IN_ATTRIB | IN_OPEN |
+ IN_CLOSE_WRITE);
reap_wd = 1;
SAFE_STAT(DIR_PATH, &buf);
diff --git a/testcases/kernel/syscalls/inotify/inotify08.c b/testcases/kernel/syscalls/inotify/inotify08.c
index 4cbb16ce0..e0837cac3 100644
--- a/testcases/kernel/syscalls/inotify/inotify08.c
+++ b/testcases/kernel/syscalls/inotify/inotify08.c
@@ -86,12 +86,7 @@ void verify_inotify(void)
SAFE_TOUCH(OVL_LOWER"/"FILE_NAME, 0644, NULL);
SAFE_TOUCH(OVL_UPPER"/"FILE_NAME, 0644, NULL);
- int len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len == -1 && errno != EAGAIN) {
- tst_brk(TBROK | TERRNO,
- "read(%d, buf, %zu) failed",
- fd_notify, EVENT_BUF_LEN);
- }
+ int len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
int i = 0, test_num = 0;
while (i < len) {
diff --git a/testcases/kernel/syscalls/inotify/inotify10.c b/testcases/kernel/syscalls/inotify/inotify10.c
index a78572dff..4c3a1d116 100644
--- a/testcases/kernel/syscalls/inotify/inotify10.c
+++ b/testcases/kernel/syscalls/inotify/inotify10.c
@@ -143,9 +143,7 @@ static void verify_inotify(unsigned int n)
test_cnt++;
}
- len = read(fd_notify, event_buf, EVENT_BUF_LEN);
- if (len == -1)
- tst_brk(TBROK | TERRNO, "read failed");
+ len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
while (i < len) {
struct event_t *expected = &event_set[test_num];
--
2.43.0
More information about the ltp
mailing list