From c2dd12732f3102f37e72f830c20a2dd8f8da646a Mon Sep 17 00:00:00 2001 From: Kaixu Xia Date: Mon, 7 Dec 2020 19:41:05 +0800 Subject: [PATCH] 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 Signed-off-by: Kaixu Xia Signed-off-by: Eryu Guan --- 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.30.2