From: Pavel Reichl <preichl@redhat.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 1/1] xfs: Skip repetitive warnings about mount options
Date: Sat, 20 Feb 2021 23:15:49 +0100 [thread overview]
Message-ID: <20210220221549.290538-3-preichl@redhat.com> (raw)
In-Reply-To: <20210220221549.290538-1-preichl@redhat.com>
Skip the warnings about mount option being deprecated if we are
remounting and deprecated option state is not changing.
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211605
Fix-suggested-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Pavel Reichl <preichl@redhat.com>
---
fs/xfs/xfs_super.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 813be879a5e5..6724a7018d1f 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1169,6 +1169,13 @@ xfs_fs_parse_param(
struct fs_parse_result result;
int size = 0;
int opt;
+ uint64_t prev_m_flags = 0; /* Mount flags of prev. mount */
+ bool remounting = fc->purpose & FS_CONTEXT_FOR_RECONFIGURE;
+
+ /* if reconfiguring then get mount flags of previous flags */
+ if (remounting) {
+ prev_m_flags = XFS_M(fc->root->d_sb)->m_flags;
+ }
opt = fs_parse(fc, xfs_fs_parameters, param, &result);
if (opt < 0)
@@ -1294,19 +1301,27 @@ xfs_fs_parse_param(
#endif
/* Following mount options will be removed in September 2025 */
case Opt_ikeep:
- xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ if (!remounting || !(prev_m_flags & XFS_MOUNT_IKEEP)) {
+ xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ }
mp->m_flags |= XFS_MOUNT_IKEEP;
return 0;
case Opt_noikeep:
- xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ if (!remounting || prev_m_flags & XFS_MOUNT_IKEEP) {
+ xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ }
mp->m_flags &= ~XFS_MOUNT_IKEEP;
return 0;
case Opt_attr2:
- xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ if (!remounting || !(prev_m_flags & XFS_MOUNT_ATTR2)) {
+ xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ }
mp->m_flags |= XFS_MOUNT_ATTR2;
return 0;
case Opt_noattr2:
- xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ if (!remounting || !(prev_m_flags & XFS_MOUNT_NOATTR2)) {
+ xfs_warn(mp, "%s mount option is deprecated.", param->key);
+ }
mp->m_flags &= ~XFS_MOUNT_ATTR2;
mp->m_flags |= XFS_MOUNT_NOATTR2;
return 0;
--
2.29.2
next prev parent reply other threads:[~2021-02-20 22:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-20 22:15 xfs: Skip repetitive warnings about mount options Pavel Reichl
2021-02-20 22:15 ` [PATCH] xfs: Add test for printing deprec. " Pavel Reichl
2021-02-22 21:22 ` Darrick J. Wong
2021-02-23 16:41 ` Pavel Reichl
2021-02-23 16:54 ` Darrick J. Wong
2021-02-20 22:15 ` Pavel Reichl [this message]
2021-02-22 21:28 ` [PATCH 1/1] xfs: Skip repetitive warnings about " Darrick J. Wong
2021-02-23 4:32 ` Dave Chinner
2021-02-22 22:19 ` Eric Sandeen
2021-02-23 17:53 ` Pavel Reichl
2021-02-23 18:10 ` Eric Sandeen
2021-02-23 18:25 ` Darrick J. Wong
2021-02-23 21:05 ` Eric Sandeen
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=20210220221549.290538-3-preichl@redhat.com \
--to=preichl@redhat.com \
--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