common/quota: allow removing quota options entirely in _qmount_option

Add support for dropping all quota related options instead of only
overriding them with new ones to _qmount_option.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/quota b/common/quota
index 883a28a20d7c95e9b22ac008cdc32df88dd8950e..7fa1a61ab64f47ccb3dea9c4d75d99a5365ebf82 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -263,7 +263,9 @@ _qmount_option()
                        -e 's/prjquota/quota/g'`
        fi
        # Ensure we have the given quota option - duplicates are fine
                        -e 's/prjquota/quota/g'`
        fi
        # Ensure we have the given quota option - duplicates are fine

-       export MOUNT_OPTIONS="$MOUNT_OPTIONS -o $OPTS"
+       if [ -n "$OPTS" ]; then
+               export MOUNT_OPTIONS="$MOUNT_OPTIONS -o $OPTS"
+       fi

        echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seqres.full
 }
 
        echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seqres.full
 }