generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV

generic/38[3-6] are made generic from xfs tests to test project
quota on other filesystems, e.g. ext4. But we should make sure
project quota is enabled in between of _scratch_enable_pquota and
_qmount. Otherwise mount will fail if there's no project quota
support on SCRATCH_DEV, e.g. ext2 and ext3.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2016-11-13 01:22:26 +08:00
parent cbc87660d5
commit 23f60ef304
4 changed files with 4 additions and 3 deletions
+1
View File
@@ -54,6 +54,7 @@ _require_xfs_quota_foreign
_scratch_mkfs >/dev/null 2>&1
_scratch_enable_pquota
_require_prjquota $SCRATCH_DEV
do_project_test()
{
+1 -1
View File
@@ -73,10 +73,10 @@ chmod a+rwx $seqres.full # arbitrary users will write here
_require_scratch
_scratch_mkfs >/dev/null 2>&1
_scratch_enable_pquota
_require_prjquota $SCRATCH_DEV
_qmount_option "prjquota"
_qmount
_require_prjquota $SCRATCH_DEV
report_quota()
{
+1 -1
View File
@@ -71,9 +71,9 @@ quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid"
_scratch_mkfs >/dev/null 2>&1
_scratch_enable_pquota
_require_prjquota $SCRATCH_DEV
_qmount_option "prjquota"
_qmount
_require_prjquota $SCRATCH_DEV
#
# Create the project root
+1 -1
View File
@@ -127,10 +127,10 @@ echo $proj_num:$proj_dir > "$my_projects"
_scratch_mkfs >> "$seqres.full" 2>&1
_scratch_enable_pquota
_require_prjquota $SCRATCH_DEV
_qmount_option "prjquota"
_qmount
_require_prjquota $SCRATCH_DEV
mkdir -p "${proj_dir}"