* [LTP] [PATCH v5 1/3] syscalls/quotactl09: Test error when quota info hidden in filesystem
@ 2022-01-11 10:28 Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 2/3] syscalls/quotactl07: Add quotactl_fd test variant Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 3/3] syscalls/quotactl: Make use of TST_EXP_PASS_SILENT and TST_EXP_FAIL Yang Xu
0 siblings, 2 replies; 3+ messages in thread
From: Yang Xu @ 2022-01-11 10:28 UTC (permalink / raw)
To: ltp
This case is similar to quotactl06 but only two differences
1) use quotactl and quotactl_fd syscalls without visible quota file
2) remove some error for addr argument
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
runtest/syscalls | 1 +
testcases/kernel/syscalls/quotactl/.gitignore | 1 +
.../kernel/syscalls/quotactl/quotactl09.c | 168 ++++++++++++++++++
3 files changed, 170 insertions(+)
create mode 100644 testcases/kernel/syscalls/quotactl/quotactl09.c
diff --git a/runtest/syscalls b/runtest/syscalls
index a0ca84b36..3b2deb64e 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1073,6 +1073,7 @@ quotactl05 quotactl05
quotactl06 quotactl06
quotactl07 quotactl07
quotactl08 quotactl08
+quotactl09 quotactl09
read01 read01
read02 read02
diff --git a/testcases/kernel/syscalls/quotactl/.gitignore b/testcases/kernel/syscalls/quotactl/.gitignore
index dab9b3420..94de2c8f2 100644
--- a/testcases/kernel/syscalls/quotactl/.gitignore
+++ b/testcases/kernel/syscalls/quotactl/.gitignore
@@ -6,3 +6,4 @@
/quotactl06
/quotactl07
/quotactl08
+/quotactl09
diff --git a/testcases/kernel/syscalls/quotactl/quotactl09.c b/testcases/kernel/syscalls/quotactl/quotactl09.c
new file mode 100644
index 000000000..e0411ce33
--- /dev/null
+++ b/testcases/kernel/syscalls/quotactl/quotactl09.c
@@ -0,0 +1,168 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu <xuyang2018.jy@fujitsu.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * Tests basic error handling of the quotactl syscall without visible quota files
+ * (use quotactl and quotactl_fd syscall):
+ *
+ * - EFAULT when addr or special is invalid
+ * - EINVAL when cmd or type is invalid
+ * - ENOTBLK when special is not a block device
+ * - ERANGE when cmd is Q_SETQUOTA, but the specified limits are out of the range
+ * allowed by the quota format
+ * - EPERM when the caller lacked the required privilege (CAP_SYS_ADMIN) for the
+ * specified operation
+ *
+ * Minimum e2fsprogs version required is 1.43.
+ */
+
+#include <errno.h>
+#include <sys/quota.h>
+#include "tst_test.h"
+#include "tst_capability.h"
+#include "quotactl_syscall_var.h"
+
+#define OPTION_INVALID 999
+
+static int32_t fmt_id = QFMT_VFS_V1;
+static int test_id, mount_flag;
+static int getnextquota_nsup;
+
+static struct if_nextdqblk res_ndq;
+
+static struct dqblk set_dqmax = {
+ .dqb_bsoftlimit = 0x7fffffffffffffffLL, /* 2^63-1 */
+ .dqb_valid = QIF_BLIMITS
+};
+
+static struct tst_cap dropadmin = {
+ .action = TST_CAP_DROP,
+ .id = CAP_SYS_ADMIN,
+ .name = "CAP_SYS_ADMIN",
+};
+
+static struct tst_cap needadmin = {
+ .action = TST_CAP_REQ,
+ .id = CAP_SYS_ADMIN,
+ .name = "CAP_SYS_ADMIN",
+};
+
+static struct tcase {
+ int cmd;
+ int *id;
+ void *addr;
+ int exp_err;
+ int on_flag;
+} tcases[] = {
+ {QCMD(Q_SETQUOTA, USRQUOTA), &fmt_id, NULL, EFAULT, 1},
+ {QCMD(OPTION_INVALID, USRQUOTA), &fmt_id, NULL, EINVAL, 0},
+ {QCMD(Q_QUOTAON, USRQUOTA), &fmt_id, NULL, ENOTBLK, 0},
+ {QCMD(Q_SETQUOTA, USRQUOTA), &test_id, &set_dqmax, ERANGE, 1},
+ {QCMD(Q_QUOTAON, USRQUOTA), &fmt_id, NULL, EPERM, 0},
+};
+
+static void verify_quotactl(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ int quota_on = 0;
+ int drop_flag = 0;
+
+ if (tc->cmd == QCMD(Q_GETNEXTQUOTA, USRQUOTA) && getnextquota_nsup) {
+ tst_res(TCONF, "current system doesn't support Q_GETNEXTQUOTA");
+ return;
+ }
+
+ if (tc->on_flag) {
+ TST_EXP_PASS_SILENT(do_quotactl(fd, QCMD(Q_QUOTAON, USRQUOTA), tst_device->dev,
+ fmt_id, NULL), "do_quotactl(QCMD(Q_QUOTAON, USRQUOTA))");
+ if (!TST_PASS)
+ return;
+ quota_on = 1;
+ }
+
+ if (tc->exp_err == EPERM) {
+ tst_cap_action(&dropadmin);
+ drop_flag = 1;
+ }
+
+ if (tst_variant) {
+ if (tc->exp_err == ENOTBLK) {
+ tst_res(TCONF, "quotactl_fd() doesn't have this error, skip");
+ return;
+ }
+ }
+ if (tc->exp_err == ENOTBLK)
+ TST_EXP_FAIL(do_quotactl(fd, tc->cmd, "/dev/null", *tc->id, tc->addr),
+ ENOTBLK, "do_quotactl()");
+ else
+ TST_EXP_FAIL(do_quotactl(fd, tc->cmd, tst_device->dev, *tc->id, tc->addr),
+ tc->exp_err, "do_quotactl()");
+
+ if (quota_on) {
+ TST_EXP_PASS_SILENT(do_quotactl(fd, QCMD(Q_QUOTAOFF, USRQUOTA), tst_device->dev,
+ fmt_id, NULL), "do_quotactl(QCMD(Q_QUOTAOFF, USRQUOTA)");
+ if (!TST_PASS)
+ return;
+ quota_on = 0;
+ }
+
+ if (drop_flag) {
+ tst_cap_action(&needadmin);
+ drop_flag = 0;
+ }
+}
+
+static void setup(void)
+{
+ unsigned int i;
+ const char *const fs_opts[] = { "-O quota", NULL};
+
+ quotactl_info();
+ SAFE_MKFS(tst_device->dev, tst_device->fs_type, fs_opts, NULL);
+ SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, NULL);
+ mount_flag = 1;
+
+ fd = SAFE_OPEN(MNTPOINT, O_RDONLY);
+ TEST(do_quotactl(fd, QCMD(Q_GETNEXTQUOTA, USRQUOTA), tst_device->dev,
+ test_id, (void *) &res_ndq));
+ if (TST_ERR == EINVAL || TST_ERR == ENOSYS)
+ getnextquota_nsup = 1;
+
+ for (i = 0; i < ARRAY_SIZE(tcases); i++) {
+ if (!tcases[i].addr)
+ tcases[i].addr = tst_get_bad_addr(NULL);
+ }
+}
+
+static void cleanup(void)
+{
+ if (fd > -1)
+ SAFE_CLOSE(fd);
+ if (mount_flag && tst_umount(MNTPOINT))
+ tst_res(TWARN | TERRNO, "umount(%s)", MNTPOINT);
+}
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_kconfigs = (const char *[]) {
+ "CONFIG_QFMT_V2",
+ NULL
+ },
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = verify_quotactl,
+ .dev_fs_type = "ext4",
+ .mntpoint = MNTPOINT,
+ .needs_device = 1,
+ .needs_root = 1,
+ .test_variants = QUOTACTL_SYSCALL_VARIANTS,
+ .needs_cmds = (const char *[]) {
+ "mkfs.ext4 >= 1.43.0",
+ NULL
+ }
+};
--
2.23.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH v5 2/3] syscalls/quotactl07: Add quotactl_fd test variant
2022-01-11 10:28 [LTP] [PATCH v5 1/3] syscalls/quotactl09: Test error when quota info hidden in filesystem Yang Xu
@ 2022-01-11 10:28 ` Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 3/3] syscalls/quotactl: Make use of TST_EXP_PASS_SILENT and TST_EXP_FAIL Yang Xu
1 sibling, 0 replies; 3+ messages in thread
From: Yang Xu @ 2022-01-11 10:28 UTC (permalink / raw)
To: ltp
Also man-pages has error that Q_XQUOTARM was not introduced by kernel
3.16[1][2]. So remove detection for this cmd.
Since kernel commit 40b52225e ("xfs: remove support for disabling quota
accounting on a mounted file system")[3] was introduced, if we want to
disable quota account feature before Q_XQUOTARM, we must need to remount
with noquota like xfs maintainer does in xfstests xfs/220 [4].
So , change this by mount with usrquota and remount with noquota to create
a test environment that superblock has quota data but quota feature not running.
[1]https://github.com/alejandro-colomar/man-pages/commit/38bccbcf4f51c5370a1060e6a80b90d68b0dcdc8
[2]https://github.com/alejandro-colomar/man-pages/commit/26f3978f04a1aeeb5397a5facebaef40a341afb6
[3]https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=40b52225e58
[4]https://patchwork.kernel.org/project/fstests/patch/20220105195352.GM656707@magnolia/
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
.../kernel/syscalls/quotactl/quotactl07.c | 43 +++++++++++--------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/testcases/kernel/syscalls/quotactl/quotactl07.c b/testcases/kernel/syscalls/quotactl/quotactl07.c
index 2992a6112..ae582d412 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl07.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl07.c
@@ -16,50 +16,57 @@
#include <stdio.h>
#include <sys/quota.h>
#include "tst_test.h"
-#include "lapi/quotactl.h"
+#include "quotactl_syscall_var.h"
#ifdef HAVE_XFS_XQM_H
# include <xfs/xqm.h>
-#define MNTPOINT "mntpoint"
-
-static uint32_t qflag_acct = XFS_QUOTA_UDQ_ACCT;
-static unsigned int valid_type = XFS_USER_QUOTA;
/* Include a valid quota type to avoid other EINVAL error */
static unsigned int invalid_type = XFS_GROUP_QUOTA << 1 | XFS_USER_QUOTA;
+static int mount_flag;
static void verify_quota(void)
{
- TEST(quotactl(QCMD(Q_XQUOTARM, USRQUOTA), tst_device->dev, 0, (void *)&invalid_type));
- if (TST_ERR == EINVAL)
- tst_res(TPASS, "Q_XQUOTARM has quota type check");
- else
- tst_res(TFAIL, "Q_XQUOTARM doesn't have quota type check");
+ TST_EXP_FAIL(do_quotactl(fd, QCMD(Q_XQUOTARM, USRQUOTA), tst_device->dev, 0,
+ (void *)&invalid_type), EINVAL, "do_quotactl(Q_XQUOTARM)");
}
static void setup(void)
{
- TEST(quotactl(QCMD(Q_XQUOTAOFF, USRQUOTA), tst_device->dev, 0, (void *)&qflag_acct));
- if (TST_RET == -1)
- tst_brk(TBROK | TTERRNO, "quotactl with Q_XQUOTAOFF failed");
+ quotactl_info();
+
+ /* ensure superblock has quota data, but not running */
+ SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, "usrquota");
+ mount_flag = 1;
+ SAFE_UMOUNT(MNTPOINT);
+ mount_flag = 0;
+ SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, "noquota");
+ mount_flag = 1;
- TEST(quotactl(QCMD(Q_XQUOTARM, USRQUOTA), tst_device->dev, 0, (void *)&valid_type));
- if (TST_ERR == EINVAL)
- tst_brk(TCONF, "current system doesn't support Q_XQUOTARM, skip it");
+ fd = SAFE_OPEN(MNTPOINT, O_RDONLY);
+}
+
+static void cleanup(void)
+{
+ if (fd > -1)
+ SAFE_CLOSE(fd);
+ if (mount_flag && tst_umount(MNTPOINT))
+ tst_res(TWARN | TERRNO, "umount(%s)", MNTPOINT);
}
static struct tst_test test = {
.setup = setup,
+ .cleanup = cleanup,
.needs_root = 1,
.needs_kconfigs = (const char *[]) {
"CONFIG_XFS_QUOTA",
NULL
},
.test_all = verify_quota,
- .mount_device = 1,
+ .format_device = 1,
.dev_fs_type = "xfs",
- .mnt_data = "usrquota",
.mntpoint = MNTPOINT,
+ .test_variants = QUOTACTL_SYSCALL_VARIANTS,
.tags = (const struct tst_tag[]) {
{"linux-git", "3dd4d40b4208"},
{}
--
2.23.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH v5 3/3] syscalls/quotactl: Make use of TST_EXP_PASS_SILENT and TST_EXP_FAIL
2022-01-11 10:28 [LTP] [PATCH v5 1/3] syscalls/quotactl09: Test error when quota info hidden in filesystem Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 2/3] syscalls/quotactl07: Add quotactl_fd test variant Yang Xu
@ 2022-01-11 10:28 ` Yang Xu
1 sibling, 0 replies; 3+ messages in thread
From: Yang Xu @ 2022-01-11 10:28 UTC (permalink / raw)
To: ltp
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
.../kernel/syscalls/quotactl/quotactl01.c | 7 ++-
.../kernel/syscalls/quotactl/quotactl02.c | 7 ++-
.../kernel/syscalls/quotactl/quotactl02.h | 45 +++++++------------
.../kernel/syscalls/quotactl/quotactl04.c | 7 ++-
.../kernel/syscalls/quotactl/quotactl05.c | 7 ++-
.../kernel/syscalls/quotactl/quotactl06.c | 35 +++++----------
6 files changed, 39 insertions(+), 69 deletions(-)
diff --git a/testcases/kernel/syscalls/quotactl/quotactl01.c b/testcases/kernel/syscalls/quotactl/quotactl01.c
index 1e0f5da70..561e5030f 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl01.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl01.c
@@ -196,11 +196,10 @@ static void verify_quota(unsigned int n)
tst_res(TCONF, "current system doesn't support this cmd");
return;
}
- TEST(quotactl(tc->cmd, tst_device->dev, *tc->id, tc->addr));
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "quotactl failed to %s", tc->des);
+ TST_EXP_PASS_SILENT(quotactl(tc->cmd, tst_device->dev, *tc->id, tc->addr),
+ "quotactl to %s", tc->des);
+ if (!TST_PASS)
return;
- }
if (memcmp(tc->res_data, tc->set_data, tc->sz)) {
tst_res(TFAIL, "quotactl failed to %s", tc->des);
diff --git a/testcases/kernel/syscalls/quotactl/quotactl02.c b/testcases/kernel/syscalls/quotactl/quotactl02.c
index c16e0a3f8..d9c4f9b2e 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl02.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl02.c
@@ -130,11 +130,10 @@ static void verify_quota(unsigned int n)
return;
}
- TEST(do_quotactl(fd, tc->cmd, tst_device->dev, test_id, tc->addr));
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "quotactl() failed to %s", tc->des);
+ TST_EXP_PASS_SILENT(do_quotactl(fd, tc->cmd, tst_device->dev, test_id, tc->addr),
+ "do_quotactl()");
+ if (!TST_PASS)
return;
- }
if (tc->flag)
tc->func_check(tc->check_subcmd, tc->des, *(int *)(tc->addr));
diff --git a/testcases/kernel/syscalls/quotactl/quotactl02.h b/testcases/kernel/syscalls/quotactl/quotactl02.h
index 28b632646..a5683ae7d 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl02.h
+++ b/testcases/kernel/syscalls/quotactl/quotactl02.h
@@ -49,15 +49,12 @@ static void check_support_cmd(int quotatype)
static void check_qoff(int subcmd, char *desp, int flag)
{
- int res;
struct fs_quota_stat res_qstat;
- res = do_quotactl(fd, subcmd, tst_device->dev, test_id, (void *) &res_qstat);
- if (res == -1) {
- tst_res(TFAIL | TERRNO,
- "quotactl() failed to get xfs quota off status");
+ TST_EXP_PASS_SILENT(do_quotactl(fd, subcmd, tst_device->dev, test_id,
+ (void *) &res_qstat), "do_quotactl() to %s", desp);
+ if (!TST_PASS)
return;
- }
if (res_qstat.qs_flags & flag) {
tst_res(TFAIL, "xfs quota enforcement was on unexpectedly");
@@ -69,15 +66,12 @@ static void check_qoff(int subcmd, char *desp, int flag)
static void check_qon(int subcmd, char *desp, int flag)
{
- int res;
struct fs_quota_stat res_qstat;
- res = do_quotactl(fd, subcmd, tst_device->dev, test_id, (void *) &res_qstat);
- if (res == -1) {
- tst_res(TFAIL | TERRNO,
- "quotactl() failed to get xfs quota on status");
+ TST_EXP_PASS_SILENT(do_quotactl(fd, subcmd, tst_device->dev, test_id,
+ (void *) &res_qstat), "do_quotactl() to %s", desp);
+ if (!TST_PASS)
return;
- }
if (!(res_qstat.qs_flags & flag)) {
tst_res(TFAIL, "xfs quota enforcement was off unexpectedly");
@@ -89,17 +83,14 @@ static void check_qon(int subcmd, char *desp, int flag)
static void check_qoffv(int subcmd, char *desp, int flag)
{
- int res;
struct fs_quota_statv res_qstatv = {
.qs_version = FS_QSTATV_VERSION1,
};
- res = do_quotactl(fd, subcmd, tst_device->dev, test_id, (void *) &res_qstatv);
- if (res == -1) {
- tst_res(TFAIL | TERRNO,
- "quotactl() failed to get xfs quota off stav");
+ TST_EXP_PASS_SILENT(do_quotactl(fd, subcmd, tst_device->dev, test_id,
+ (void *) &res_qstatv), "do_quotactl() to %s", desp);
+ if (!TST_PASS)
return;
- }
if (res_qstatv.qs_flags & flag) {
tst_res(TFAIL, "xfs quota enforcement was on unexpectedly");
@@ -111,17 +102,14 @@ static void check_qoffv(int subcmd, char *desp, int flag)
static void check_qonv(int subcmd, char *desp, int flag)
{
- int res;
struct fs_quota_statv res_qstatv = {
.qs_version = FS_QSTATV_VERSION1
};
- res = do_quotactl(fd, subcmd, tst_device->dev, test_id, (void *) &res_qstatv);
- if (res == -1) {
- tst_res(TFAIL | TERRNO,
- "quotactl() failed to get xfs quota on statv");
+ TST_EXP_PASS_SILENT(do_quotactl(fd, subcmd, tst_device->dev, test_id,
+ (void *) &res_qstatv), "do_quotactl() to %s", desp);
+ if (!TST_PASS)
return;
- }
if (!(res_qstatv.qs_flags & flag)) {
tst_res(TFAIL, "xfs quota enforcement was off unexpectedly");
@@ -133,17 +121,14 @@ static void check_qonv(int subcmd, char *desp, int flag)
static void check_qlim(int subcmd, char *desp)
{
- int res;
static struct fs_disk_quota res_dquota;
res_dquota.d_rtb_softlimit = 0;
- res = do_quotactl(fd, subcmd, tst_device->dev, test_id, (void *) &res_dquota);
- if (res == -1) {
- tst_res(TFAIL | TERRNO,
- "quotactl() failed to get xfs disk quota limits");
+ TST_EXP_PASS_SILENT(do_quotactl(fd, subcmd, tst_device->dev, test_id,
+ (void *) &res_dquota), "do_quotactl() to %s", desp);
+ if (!TST_PASS)
return;
- }
if (res_dquota.d_id != test_id) {
tst_res(TFAIL, "quotactl() got unexpected user id %u, expected %u",
diff --git a/testcases/kernel/syscalls/quotactl/quotactl04.c b/testcases/kernel/syscalls/quotactl/quotactl04.c
index 44273c35d..55da28270 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl04.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl04.c
@@ -145,11 +145,10 @@ static void verify_quota(unsigned int n)
tst_res(TINFO, "Test #%d: %s", n, tc->tname);
- TEST(do_quotactl(fd, tc->cmd, tst_device->dev, *tc->id, tc->addr));
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "quotactl failed to %s", tc->des);
+ TST_EXP_PASS_SILENT(do_quotactl(fd, tc->cmd, tst_device->dev, *tc->id, tc->addr),
+ "do_quotactl to %s", tc->des);
+ if (!TST_PASS)
return;
- }
if (memcmp(tc->res_data, tc->set_data, tc->sz)) {
tst_res(TFAIL, "quotactl failed to %s", tc->des);
diff --git a/testcases/kernel/syscalls/quotactl/quotactl05.c b/testcases/kernel/syscalls/quotactl/quotactl05.c
index 541007e97..ac75cee31 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl05.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl05.c
@@ -93,11 +93,10 @@ static void verify_quota(unsigned int n)
return;
}
- TEST(do_quotactl(fd, tc->cmd, tst_device->dev, test_id, tc->addr));
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "quotactl() failed to %s", tc->des);
+ TST_EXP_PASS_SILENT(do_quotactl(fd, tc->cmd, tst_device->dev, test_id, tc->addr),
+ "do_quotactl()");
+ if (!TST_PASS)
return;
- }
if (tc->flag)
tc->func_check(tc->check_subcmd, tc->des, *(int *)(tc->addr));
diff --git a/testcases/kernel/syscalls/quotactl/quotactl06.c b/testcases/kernel/syscalls/quotactl/quotactl06.c
index 21a86ad1e..d2fadc895 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl06.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl06.c
@@ -112,11 +112,10 @@ static void verify_quotactl(unsigned int n)
}
if (tc->on_flag) {
- TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), tst_device->dev,
- fmt_id, usrpath));
- if (TST_RET == -1)
- tst_brk(TBROK,
- "quotactl with Q_QUOTAON returned %ld", TST_RET);
+ TST_EXP_PASS_SILENT(quotactl(QCMD(Q_QUOTAON, USRQUOTA), tst_device->dev,
+ fmt_id, usrpath), "quotactl with Q_QUOTAON");
+ if (!TST_PASS)
+ return;
quota_on = 1;
}
@@ -126,27 +125,17 @@ static void verify_quotactl(unsigned int n)
}
if (tc->exp_err == ENOTBLK)
- TEST(quotactl(tc->cmd, "/dev/null", *tc->id, tc->addr));
+ TST_EXP_FAIL(quotactl(tc->cmd, "/dev/null", *tc->id, tc->addr),
+ ENOTBLK, "quotactl()");
else
- TEST(quotactl(tc->cmd, tst_device->dev, *tc->id, tc->addr));
- if (TST_RET == -1) {
- if (tc->exp_err == TST_ERR) {
- tst_res(TPASS | TTERRNO, "quotactl failed as expected");
- } else {
- tst_res(TFAIL | TTERRNO,
- "quotactl failed unexpectedly; expected %s, but got",
- tst_strerrno(tc->exp_err));
- }
- } else {
- tst_res(TFAIL, "quotactl returned wrong value: %ld", TST_RET);
- }
+ TST_EXP_FAIL(quotactl(tc->cmd, tst_device->dev, *tc->id, tc->addr),
+ tc->exp_err, "quotactl()");
if (quota_on) {
- TEST(quotactl(QCMD(Q_QUOTAOFF, USRQUOTA), tst_device->dev,
- fmt_id, usrpath));
- if (TST_RET == -1)
- tst_brk(TBROK,
- "quotactl with Q_QUOTAOFF returned %ld", TST_RET);
+ TST_EXP_PASS_SILENT(quotactl(QCMD(Q_QUOTAOFF, USRQUOTA), tst_device->dev,
+ fmt_id, usrpath), "quotactl with Q_QUOTAOFF");
+ if (!TST_PASS)
+ return;
quota_on = 0;
}
--
2.23.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-11 10:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-11 10:28 [LTP] [PATCH v5 1/3] syscalls/quotactl09: Test error when quota info hidden in filesystem Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 2/3] syscalls/quotactl07: Add quotactl_fd test variant Yang Xu
2022-01-11 10:28 ` [LTP] [PATCH v5 3/3] syscalls/quotactl: Make use of TST_EXP_PASS_SILENT and TST_EXP_FAIL Yang Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.