All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 1/6] common/quota: allow removing quota options entirely in _qmount_option
Date: Mon, 12 Jul 2021 13:11:41 +0200	[thread overview]
Message-ID: <20210712111146.82734-2-hch@lst.de> (raw)
In-Reply-To: <20210712111146.82734-1-hch@lst.de>

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>
---
 common/quota | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/quota b/common/quota
index 883a28a2..7fa1a61a 100644
--- 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
-	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
 }
 
-- 
2.30.2


  reply	other threads:[~2021-07-12 11:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12 11:11 prepare for removing support to disable quota accounting Christoph Hellwig
2021-07-12 11:11 ` Christoph Hellwig [this message]
2021-07-14 23:35   ` [PATCH 1/6] common/quota: allow removing quota options entirely in _qmount_option Darrick J. Wong
2021-07-12 11:11 ` [PATCH 2/6] xfs/007: unmount after disabling quota Christoph Hellwig
2021-07-14 23:35   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 3/6] xfs/106: don't test disabling quota accounting Christoph Hellwig
2021-07-14 23:37   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 4/6] xfs/220: avoid failure when disabling quota accounting is not supported Christoph Hellwig
2021-07-14 23:30   ` Darrick J. Wong
2021-07-20  6:37     ` Christoph Hellwig
2021-07-12 11:11 ` [PATCH 5/6] xfs/304: don't turn quota accounting off Christoph Hellwig
2021-07-14 23:29   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 6/6] xfs/305: " Christoph Hellwig
2021-07-14 23:28   ` Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210712111146.82734-2-hch@lst.de \
    --to=hch@lst.de \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.