[LTP] [PATCH v2 03/13] syscalls/quotactl04: Remove useless mount option

[Cyril Hrubis]

Hi!
> Adjust header position.
> 
> [1]https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7c319d3

So this went in to Linux 3.5 looking at supported versions of SLES and
RHEL it looks that anything older went out of support, so it's likely
that we do not care anymore.

Or does anyone still needs to test quota on kernels older than 3.5?


> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
>  .../kernel/syscalls/quotactl/quotactl04.c     | 41 ++++++++-----------
>  1 file changed, 17 insertions(+), 24 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/quotactl/quotactl04.c b/testcases/kernel/syscalls/quotactl/quotactl04.c
> index fd3afc888..f34050716 100644
> --- a/testcases/kernel/syscalls/quotactl/quotactl04.c
> +++ b/testcases/kernel/syscalls/quotactl/quotactl04.c
> @@ -1,24 +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>
> + * Copyright (c) 2019-2021 FUJITSU LIMITED. All rights reserved.
> + * Author: Yang Xu <xuyang2018.jy@fujitsu.com>
> + */
> +
> +/*\
> + * [Description]
>   *
> - * This testcase checks the basic flag of quotactl(2) for project quota on
> - * non-XFS filesystems.
> + * This testcases checks that quotactl(2) on ext4 filesystem succeeds to:
>   *
> - * 1) quotactl(2) succeeds to turn on quota with Q_QUOTAON flag for project.
> - * 2) quotactl(2) succeeds to set disk quota limits with Q_SETQUOTA flag
> - *    for project.
> - * 3) quotactl(2) succeeds to get disk quota limits with Q_GETQUOTA flag
> - *    for project.
> - * 4) quotactl(2) succeeds to set information about quotafile with Q_SETINFO
> - *    flag for project.
> - * 5) quotactl(2) succeeds to get information about quotafile with Q_GETINFO
> - *    flag for project.
> - * 6) quotactl(2) succeeds to get quota format with Q_GETFMT flag for project.
> - * 7) quotactl(2) succeeds to get disk quota limit greater than or equal to
> - *    ID with Q_GETNEXTQUOTA flag for project.
> - * 8) quotactl(2) succeeds to turn off quota with Q_QUOTAOFF flag for project.
> + * - turn on quota with Q_QUOTAON flag for project
> + * - set disk quota limits with Q_SETQUOTA flag for project
> + * - get disk quota limits with Q_GETQUOTA flag for project
> + * - set information about quotafile with Q_SETINFO flag for project
> + * - get information about quotafile with Q_GETINFO flag for project
> + * - get quota format with Q_GETFMT flag for project
> + * - get disk quota limit greater than or equal to ID with Q_GETNEXTQUOTA flag for project
> + * - turn off quota with Q_QUOTAOFF flag for project
>   *
>   * Minimum e2fsprogs version required is 1.43.
>   */

It would be cleaner to separate the change to the description from the
possibly functional change that removes the mount option. It would be
much easier to revert the functional change in the very unlikely case
that we ever need it.

> @@ -29,14 +27,9 @@
>  #include <stdio.h>
>  #include <sys/stat.h>
>  #include <sys/mount.h>
> -#include "config.h"
> -#include "lapi/quotactl.h"
>  #include "tst_safe_stdio.h"
>  #include "tst_test.h"
> -
> -#ifndef QFMT_VFS_V1
> -# define QFMT_VFS_V1 4
> -#endif
> +#include "lapi/quotactl.h"
>  
>  #define FMTID QFMT_VFS_V1
>  #define MNTPOINT	"mntpoint"
> @@ -141,7 +134,7 @@ static void setup(void)
>  		tst_brk(TCONF, "Test needs mkfs.ext4 >= 1.43 for quota,project option, test skipped");
>  	pclose(f);
>  	SAFE_MKFS(tst_device->dev, tst_device->fs_type, fs_opts, NULL);
> -	do_mount(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, "quota");
> +	do_mount(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, NULL);
>  }
>  
>  static void cleanup(void)
> -- 
> 2.23.0
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz