From: Christoph Hellwig <hch@lst.de>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org, "Darrick J . Wong" <djwong@kernel.org>
Subject: [PATCH 1/7] common/quota: allow removing quota options entirely in _qmount_option
Date: Thu, 22 Jul 2021 09:38:26 +0200 [thread overview]
Message-ID: <20210722073832.976547-2-hch@lst.de> (raw)
In-Reply-To: <20210722073832.976547-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>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
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
next prev parent reply other threads:[~2021-07-22 7:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 7:38 prepare for removing support to disable quota accounting v2 Christoph Hellwig
2021-07-22 7:38 ` Christoph Hellwig [this message]
2021-07-22 7:38 ` [PATCH 2/7] xfs/007: unmount after disabling quota Christoph Hellwig
2021-07-22 7:38 ` [PATCH 3/7] xfs/106: don't test disabling quota accounting Christoph Hellwig
2021-07-22 18:23 ` Darrick J. Wong
2021-07-22 7:38 ` [PATCH 4/7] xfs/220: avoid failure when disabling quota accounting is not supported Christoph Hellwig
2021-07-22 18:24 ` Darrick J. Wong
2021-07-22 7:38 ` [PATCH 5/7] xfs/304: don't turn quota accounting off Christoph Hellwig
2021-07-22 7:38 ` [PATCH 6/7] xfs/305: " Christoph Hellwig
2021-07-22 7:38 ` [PATCH 7/7] xfs: use $XFS_QUOTA_PROG instead of hardcoding xfs_quota Christoph Hellwig
2021-07-22 18:25 ` Darrick J. Wong
2021-07-22 23:17 ` Darrick J. Wong
2021-07-25 15:02 ` Eryu Guan
2021-07-23 5:08 ` [PATCH 8/7] xfs/152: avoid failure when quotaoff is not supported Darrick J. Wong
2021-07-23 5:10 ` Christoph Hellwig
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=20210722073832.976547-2-hch@lst.de \
--to=hch@lst.de \
--cc=djwong@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).