common/quota: filter out option projquota in _qmount_option for ocfs2

ocfs2 doesn't support projquota but does support usrquota an grpquota.
For now, two tests generic/594 and generic/603 are for testing
usrquota,grpquota and projquota. The mount option 'projquota' causes
failure of ocfs2 mount.

To make things simple, just skip the tests for ocfs2.
However, we can't just put '_require_prjquota $SCRATCH_DEV' before
_qmount because f2fs and xfs need runtime after mount of SCRATCH_DEV.

For ocfs2, filter out option 'projquota' in _qmount_option() to make
_qmount successful. Then in _require_prjquota(), ocfs2 will fallthrough
as a no kernel projquota support fs type.

Signed-off-by: Su Yue <glass.su@suse.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/quota b/common/quota
index 8135b7c044bf4459ef6c91ca749603c74d09cb7e..8688116c6547a9112870047da69666ef88cad775 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -325,6 +325,9 @@ _qmount_option()
                OPTS=`echo $OPTS \
                | sed   -e 's/\bpquota/quota/g' \
                        -e 's/prjquota/quota/g'`
+       # ocfs2 doesn't support "-o projquota"
+       elif [[ "$FSTYP" == ocfs2 ]]; then
+               OPTS=`echo $OPTS | sed -e 's/prjquota//g'`
        fi
        # Ensure we have the given quota option - duplicates are fine
        if [ -n "$OPTS" ]; then