diff options
| author | Jan Kara <jack@suse.cz> | 2018-05-14 19:03:49 +0200 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2018-05-16 14:00:25 +0800 |
| commit | b2bffe5c77d6d680361c57015c79396de166b138 (patch) | |
| tree | ac839f39f34d96f9307d11f5610ef977fbf2d429 | |
| parent | 5018cd1c0f9f08f18c13b9e2c75cc9d8e214ddc4 (diff) | |
| download | xfstests-dev-b2bffe5c77d6d680361c57015c79396de166b138.tar.gz | |
common/quota: Make project quota handling work for ext2 & ext3
Project quota can work for ext2 & ext3 the same way as for ext4.
Handle them properly as currently the tests just fail because of
unknown prjquota mount option. After this patch, tests will be "not
run" because ext4 driver refuses to use project quota mount options
for "old" fs types.
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rw-r--r-- | common/quota | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/quota b/common/quota index f8e037995a..2b99521df4 100644 --- a/common/quota +++ b/common/quota @@ -90,9 +90,9 @@ _require_xfs_quota_foreign() _require_prjquota() { [ -n "$1" ] && _dev="$1" || _dev="$TEST_DEV" - if [ "$FSTYP" == "ext4" ]; then + if [[ "$FSTYP" == ext[234] ]]; then dumpe2fs -h $_dev 2>&1 | grep -qw project || \ - _notrun "Project quota not available on this ext4" + _notrun "Project quota not available on this $FSTYP" fi src/feature -P $_dev [ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas" @@ -116,7 +116,7 @@ _require_getnextquota() # prior to mount. This is a relatively new feature ... _scratch_enable_pquota() { - [ "$FSTYP" != "ext4" ] && return + [[ "$FSTYP" != ext[234] ]] && return tune2fs -O quota,project $SCRATCH_DEV >>$seqres.full 2>&1 _try_scratch_mount >/dev/null 2>&1 \ @@ -242,7 +242,7 @@ _qmount_option() # ext4 doesn't _do_ "-o pquota/prjquota" because reasons # Switch it to "quota" to enable mkfs-time pquota - if [ "$FSTYP" == "ext4" ]; then + if [[ "$FSTYP" == ext[234] ]]; then OPTS=`echo $OPTS \ | sed -e 's/\bpquota/quota/g' \ -e 's/prjquota/quota/g'` |