@@ -1,50 +1,28 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (c) 2013-2019 FUJITSU LIMITED. All rights reserved
+ * Copyright (c) 2013-2021 FUJITSU LIMITED. All rights reserved
* Author: DAN LI <li.dan@cn.fujitsu.com>
- * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Author: Yang Xu <xuyang2018.jy@fujitsu.com>
*/
/*\
* [Description]
*
- * This testcase checks basic flags of quotactl(2) for an XFS file system:
+ * This testcases checks that quotactl(2) on xfs filesystem succeeds to:
*
- * 1. quotactl(2) succeeds to turn off xfs quota and get xfs quota off status
- * for user.
- *
- * 2. quotactl(2) succeeds to turn on xfs quota and get xfs quota on status
- * for user.
- *
- * 3. quotactl(2) succeeds to set and use Q_XGETQUOTA to get xfs disk quota
- * limits for user.
- *
- * 4. quotactl(2) succeeds to set and use Q_XGETNEXTQUOTA to get xfs disk
- * quota limits greater than or equal to ID for user.
- *
- * 5. quotactl(2) succeeds to turn off xfs quota and get xfs quota off statv
- * for user.
- *
- * 6. quotactl(2) succeeds to turn on xfs quota and get xfs quota on statv
- * for user.
- *
- * 7. quotactl(2) succeeds to turn off xfs quota and get xfs quota off status
- * for group.
- *
- * 8. quotactl(2) succeeds to turn on xfs quota and get xfs quota on status
- * for group.
- *
- * 9. quotactl(2) succeeds to set and use Q_XGETQUOTA to get xfs disk quota
- * limits for group.
- *
- * 10. quotactl(2) succeeds to set and use Q_XGETNEXTQUOTA to get xfs disk
- * quota limits for group.
- *
- * 11. quotactl(2) succeeds to turn off xfs quota and get xfs quota off statv
- * for group.
- *
- * 12. quotactl(2) succeeds to turn on xfs quota and get xfs quota on statv
- * for group.
+ * - turn off xfs quota and get xfs quota off status for user
+ * - turn on xfs quota and get xfs quota on status for user
+ * - set and use Q_XGETQUOTA to get xfs disk quota limits for user
+ * - set and use Q_XGETNEXTQUOTA to get xfs disk quota limits greater than or
+ * equal to ID for user
+ * - turn off xfs quota and get xfs quota off statv for user
+ * - turn on xfs quota and get xfs quota on statv for user
+ * - turn off xfs quota and get xfs quota off status for group
+ * - turn on xfs quota and get xfs quota on status for group
+ * - set and use Q_XGETQUOTA to get xfs disk quota limits for group
+ * - set and use Q_XGETNEXTQUOTA to get xfs disk quota limits for group
+ * - turn off xfs quota and get xfs quota off statv for group
+ * - turn on xfs quota and get xfs quota on statv for gorup
*/
#include "quotactl02.h"
@@ -1,14 +1,13 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
- * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Author: Yang Xu <xuyang2018.jy@fujitsu.com>
*/
#ifndef QUOTACTL02_H
#define QUOTACTL02_H
#define _GNU_SOURCE
-#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
@@ -4,10 +4,9 @@
* Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
*/
-/*
- * Test Name: quotactl03
+/*\
+ * [Description]
*
- * Description:
* quotactl(2) with XGETNEXTQUOTA looks for the next active quota for an user
* equal or higher to a given ID, in this test the ID is specified to a value
* close to UINT_MAX(max value of unsigned int). When reaching the upper limit
@@ -16,11 +15,11 @@
*
* This kernel bug of xfs has been fixed in:
*
- * commit 657bdfb7f5e68ca5e2ed009ab473c429b0d6af85
- * Author: Eric Sandeen <sandeen@redhat.com>
- * Date: Tue Jan 17 11:43:38 2017 -0800
+ * commit 657bdfb7f5e68ca5e2ed009ab473c429b0d6af85
+ * Author: Eric Sandeen <sandeen@redhat.com>
+ * Date: Tue Jan 17 11:43:38 2017 -0800
*
- * xfs: don't wrap ID in xfs_dq_get_next_id
+ * xfs: don't wrap ID in xfs_dq_get_next_id
*/
#define _GNU_SOURCE
@@ -75,6 +74,10 @@ static struct tst_test test = {
.dev_fs_type = "xfs",
.mntpoint = mntpoint,
.mnt_data = "usrquota",
+ .tags = (const struct tst_tag[]) {
+ {"linux-git", "657bdfb7f5e6"},
+ {}
+ }
};
#else
@@ -1,23 +1,23 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
- * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Copyright (c) 2019-2021 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu <xuyang2018.jy@.fujitsu.com>
+ */
+
+/*\
+ * [Description]
*
- * This testcase checks basic flags of quotactl(2) for project on an XFS file
- * system:
- * 1) quotactl(2) succeeds to turn off xfs quota and get xfs quota off status
- * for project.
- * 2) quotactl(2) succeeds to turn on xfs quota and get xfs quota on status
- * for project.
- * 3) quotactl(2) succeeds to set and use Q_XGETQUOTA to get xfs disk quota
- * limits for project.
- * 4) quotactl(2) succeeds to set and use Q_XGETNEXTQUOTA to get xfs disk
- * quota limits Cgreater than or equal to ID for project.
- * 5) quotactl(2) succeeds to turn off xfs quota and get xfs quota off statv
- * for project.
- * 6) quotactl(2) succeeds to turn on xfs quota and get xfs quota on statv
- * for project.
+ * This testcases checks that quotactl(2) on xfs filesystem succeeds to:
+ *
+ * - turn off xfs quota and get xfs quota off status for project
+ * - turn on xfs quota and get xfs quota on status for project
+ * - set and use Q_XGETQUOTA to get xfs disk quota limits for project
+ * - set and use Q_XGETNEXTQUOTA to get xfs disk quota limits greater than or
+ * equal to ID for project
+ * - turn off xfs quota and get xfs quota off statv for project
+ * - turn on xfs quota and get xfs quota on statvfor project
*/
+
#include "quotactl02.h"
#if defined(HAVE_XFS_XQM_H)
@@ -1,19 +1,22 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
- * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Author: Yang Xu <xuyang2018.jy@fujitsu.com>
+ */
+
+/*\
+ * [Description]
*
* This is a regresstion test for kernel commit 3dd4d40b4208
* ("xfs: Sanity check flags of Q_XQUOTARM call").
*/
-#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/quota.h>
-#include "lapi/quotactl.h"
#include "tst_test.h"
+#include "lapi/quotactl.h"
#ifdef HAVE_XFS_XQM_H
# include <xfs/xqm.h>
Also remove useless header files and add linux git in test structure. Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- .../kernel/syscalls/quotactl/quotactl02.c | 54 ++++++------------- .../kernel/syscalls/quotactl/quotactl02.h | 3 +- .../kernel/syscalls/quotactl/quotactl03.c | 17 +++--- .../kernel/syscalls/quotactl/quotactl05.c | 32 +++++------ .../kernel/syscalls/quotactl/quotactl07.c | 9 ++-- 5 files changed, 49 insertions(+), 66 deletions(-)