[PATCH] xfs/513: fix the regression caused by mount option uqnoenforce

[PATCH] xfs/513: fix the regression caused by mount option uqnoenforce

[xiakaixu1987]

From: Kaixu Xia <kaixuxia@tencent.com>

The mount options uqnoenforce and qnoenforce no longer cause 'usrquota'
to be emitted in /proc/mounts, so there is a regression in xfs/513. Fix
it by using proper output option uqnoenforce.

Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
---
 tests/xfs/513     | 4 ++--
 tests/xfs/513.out | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/xfs/513 b/tests/xfs/513
index dfb25a8b..9045dbb5 100755
--- a/tests/xfs/513
+++ b/tests/xfs/513
@@ -302,8 +302,8 @@ do_test "" pass "usrquota" "false"
 do_test "-o uquota" pass "usrquota" "true"
 do_test "-o usrquota" pass "usrquota" "true"
 do_test "-o quota" pass "usrquota" "true"
-do_test "-o uqnoenforce" pass "usrquota" "true"
-do_test "-o qnoenforce" pass "usrquota" "true"
+do_test "-o uqnoenforce" pass "uqnoenforce" "true"
+do_test "-o qnoenforce" pass "uqnoenforce" "true"
 
 # Test gquota/grpquota/gqnoenforce
 do_test "" pass "grpquota" "false"
diff --git a/tests/xfs/513.out b/tests/xfs/513.out
index 6681a7e8..eec8155d 100644
--- a/tests/xfs/513.out
+++ b/tests/xfs/513.out
@@ -76,8 +76,8 @@ TEST: "" "pass" "usrquota" "false"
 TEST: "-o uquota" "pass" "usrquota" "true"
 TEST: "-o usrquota" "pass" "usrquota" "true"
 TEST: "-o quota" "pass" "usrquota" "true"
-TEST: "-o uqnoenforce" "pass" "usrquota" "true"
-TEST: "-o qnoenforce" "pass" "usrquota" "true"
+TEST: "-o uqnoenforce" "pass" "uqnoenforce" "true"
+TEST: "-o qnoenforce" "pass" "uqnoenforce" "true"
 TEST: "" "pass" "grpquota" "false"
 TEST: "-o gquota" "pass" "grpquota" "true"
 TEST: "-o grpquota" "pass" "grpquota" "true"
-- 
2.20.0

Re: [PATCH] xfs/513: fix the regression caused by mount option uqnoenforce

[Darrick J. Wong]

On Mon, Dec 07, 2020 at 07:41:05PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
> 
> The mount options uqnoenforce and qnoenforce no longer cause 'usrquota'
> to be emitted in /proc/mounts, so there is a regression in xfs/513. Fix
> it by using proper output option uqnoenforce.
> 
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>

Seems reasonable once the upstream change gets a commit id so that we
can point people at how to fix this new regression.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  tests/xfs/513     | 4 ++--
>  tests/xfs/513.out | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/xfs/513 b/tests/xfs/513
> index dfb25a8b..9045dbb5 100755
> --- a/tests/xfs/513
> +++ b/tests/xfs/513
> @@ -302,8 +302,8 @@ do_test "" pass "usrquota" "false"
>  do_test "-o uquota" pass "usrquota" "true"
>  do_test "-o usrquota" pass "usrquota" "true"
>  do_test "-o quota" pass "usrquota" "true"
> -do_test "-o uqnoenforce" pass "usrquota" "true"
> -do_test "-o qnoenforce" pass "usrquota" "true"
> +do_test "-o uqnoenforce" pass "uqnoenforce" "true"
> +do_test "-o qnoenforce" pass "uqnoenforce" "true"
>  
>  # Test gquota/grpquota/gqnoenforce
>  do_test "" pass "grpquota" "false"
> diff --git a/tests/xfs/513.out b/tests/xfs/513.out
> index 6681a7e8..eec8155d 100644
> --- a/tests/xfs/513.out
> +++ b/tests/xfs/513.out
> @@ -76,8 +76,8 @@ TEST: "" "pass" "usrquota" "false"
>  TEST: "-o uquota" "pass" "usrquota" "true"
>  TEST: "-o usrquota" "pass" "usrquota" "true"
>  TEST: "-o quota" "pass" "usrquota" "true"
> -TEST: "-o uqnoenforce" "pass" "usrquota" "true"
> -TEST: "-o qnoenforce" "pass" "usrquota" "true"
> +TEST: "-o uqnoenforce" "pass" "uqnoenforce" "true"
> +TEST: "-o qnoenforce" "pass" "uqnoenforce" "true"
>  TEST: "" "pass" "grpquota" "false"
>  TEST: "-o gquota" "pass" "grpquota" "true"
>  TEST: "-o grpquota" "pass" "grpquota" "true"
> -- 
> 2.20.0
>