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

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.

You'll need kernel commit 237d7887ae72 ("xfs: show the proper user
quota options") to pass the test.

[Eryu: add kernel commit info in commit log]

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/xfs/513 b/tests/xfs/513
index dfb25a8b0f69c387b9afd28b943947ac88ed7195..9045dbb55e0fec090cb97b7c11838a8c0ca52b11 100755 (executable)
--- 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 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"
 
 # Test gquota/grpquota/gqnoenforce
 do_test "" pass "grpquota" "false"

diff --git a/tests/xfs/513.out b/tests/xfs/513.out
index 6681a7e8255be4d10b6731ed47b10ff4f203528a..eec8155d7bf348a74241c59caa0aff172d184b91 100644 (file)
--- 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 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"
 TEST: "" "pass" "grpquota" "false"
 TEST: "-o gquota" "pass" "grpquota" "true"
 TEST: "-o grpquota" "pass" "grpquota" "true"