[LTP] [PATCH v3 2/3] Make use of SAFE_ACCESS
Dai Shili
daisl.fnst@fujitsu.com
Fri Mar 18 19:55:46 CET 2022
1. quotactl01: Replace tst_brk(TFAIL) with TBROK
2. use SAFE_ACCESS
Signed-off-by: Dai Shili <daisl.fnst@fujitsu.com>
---
testcases/kernel/mem/tunable/max_map_count.c | 4 +---
testcases/kernel/syscalls/fanotify/fanotify17.c | 3 +--
testcases/kernel/syscalls/getxattr/getxattr05.c | 3 +--
testcases/kernel/syscalls/madvise/madvise08.c | 3 +--
testcases/kernel/syscalls/quotactl/quotactl01.c | 6 ++----
testcases/kernel/syscalls/quotactl/quotactl06.c | 3 +--
6 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/testcases/kernel/mem/tunable/max_map_count.c b/testcases/kernel/mem/tunable/max_map_count.c
index a4c3dbf..caf8972 100644
--- a/testcases/kernel/mem/tunable/max_map_count.c
+++ b/testcases/kernel/mem/tunable/max_map_count.c
@@ -58,9 +58,7 @@ static long old_overcommit = -1;
static void setup(void)
{
- if (access(PATH_SYSVM "max_map_count", F_OK) != 0)
- tst_brk(TBROK | TERRNO,
- "Can't support to test max_map_count");
+ SAFE_ACCESS(PATH_SYSVM "max_map_count", F_OK);
old_max_map_count = get_sys_tune("max_map_count");
old_overcommit = get_sys_tune("overcommit_memory");
diff --git a/testcases/kernel/syscalls/fanotify/fanotify17.c b/testcases/kernel/syscalls/fanotify/fanotify17.c
index 35beb53..7d74b25 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify17.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify17.c
@@ -159,8 +159,7 @@ static void do_unshare(int map_root)
* uid_map file should exist since Linux 3.8 because
* it is available on Linux 3.5
*/
- if (access(UID_MAP, F_OK))
- tst_brk(TBROK, "file %s didn't exist", UID_MAP);
+ SAFE_ACCESS(UID_MAP, F_OK);
SAFE_FILE_PRINTF(UID_MAP, "%d %d %d", 0, 0, 1);
}
diff --git a/testcases/kernel/syscalls/getxattr/getxattr05.c b/testcases/kernel/syscalls/getxattr/getxattr05.c
index c0d339f..3e73cc5 100644
--- a/testcases/kernel/syscalls/getxattr/getxattr05.c
+++ b/testcases/kernel/syscalls/getxattr/getxattr05.c
@@ -100,8 +100,7 @@ static void do_unshare(int map_root)
/* uid_map file should exist since Linux 3.8 because
* it is available on Linux 3.5
*/
- if (access(UID_MAP, F_OK))
- tst_brk(TBROK, "file %s didn't exist", UID_MAP);
+ SAFE_ACCESS(UID_MAP, F_OK);
SAFE_FILE_PRINTF(UID_MAP, "%d %d %d", 0, 0, 1);
}
diff --git a/testcases/kernel/syscalls/madvise/madvise08.c b/testcases/kernel/syscalls/madvise/madvise08.c
index 30f3604..10549f4 100644
--- a/testcases/kernel/syscalls/madvise/madvise08.c
+++ b/testcases/kernel/syscalls/madvise/madvise08.c
@@ -110,8 +110,7 @@ static int find_sequence(int pid)
snprintf(dumpname, 256, "dump-%d", pid);
tst_res(TINFO, "Dump file should be %s", dumpname);
- if (access(dumpname, F_OK))
- tst_brk(TBROK | TERRNO, "Dump file was not found.");
+ SAFE_ACCESS(dumpname, F_OK);
dfd = SAFE_OPEN(dumpname, O_RDONLY);
diff --git a/testcases/kernel/syscalls/quotactl/quotactl01.c b/testcases/kernel/syscalls/quotactl/quotactl01.c
index c14228e..36ec93e 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl01.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl01.c
@@ -160,11 +160,9 @@ static void setup(void)
SAFE_CMD(cmd, NULL, NULL);
fmt_id = var->fmt_id;
- if (access(USRPATH, F_OK) == -1)
- tst_brk(TFAIL | TERRNO, "user quotafile didn't exist");
+ SAFE_ACCESS(USRPATH, F_OK);
- if (access(GRPPATH, F_OK) == -1)
- tst_brk(TFAIL | TERRNO, "group quotafile didn't exist");
+ SAFE_ACCESS(GRPPATH, F_OK);
TEST(quotactl(QCMD(Q_GETNEXTQUOTA, USRQUOTA), tst_device->dev,
test_id, (void *) &res_ndq));
diff --git a/testcases/kernel/syscalls/quotactl/quotactl06.c b/testcases/kernel/syscalls/quotactl/quotactl06.c
index ae8d7fa..74a098a 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl06.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl06.c
@@ -186,8 +186,7 @@ static void setup(void)
/* vfsv0 block limit 2^42, vfsv1 block limit 2^63 - 1 */
set_dqmax.dqb_bsoftlimit = tst_variant ? 0x20000000000000 : 0x100000000;
- if (access(USRPATH, F_OK) == -1)
- tst_brk(TBROK | TERRNO, "user quotafile didn't exist");
+ SAFE_ACCESS(USRPATH, F_OK);
SAFE_MKDIR(TESTDIR1, 0666);
--
1.8.3.1
More information about the ltp
mailing list