From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 1/3] btrfs: Remove "recovery" mount option
Date: Mon, 21 Jan 2019 14:27:16 +0800 [thread overview]
Message-ID: <20190121062718.8063-2-wqu@suse.com> (raw)
In-Reply-To: <20190121062718.8063-1-wqu@suse.com>
Commit 8dcddfa048de ("btrfs: Introduce new mount option usebackuproot to
replace recovery") deprecates "recovery" mount option in 2016, and it
has been 3 years, it should be OK to remove "recovery" mount option.
As we're even going to deprecate the successor, "usebackuproot" mount
option, there isn't really much need to keep the original option.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/super.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index c5586ffd1426..6a08f23e5600 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -311,7 +311,6 @@ enum {
Opt_defrag, Opt_nodefrag,
Opt_discard, Opt_nodiscard,
Opt_nologreplay,
- Opt_norecovery,
Opt_ratio,
Opt_rescan_uuid_tree,
Opt_skip_balance,
@@ -329,7 +328,6 @@ enum {
/* Deprecated options */
Opt_alloc_start,
- Opt_recovery,
Opt_subvolrootid,
/* Debugging options */
@@ -374,7 +372,6 @@ static const match_table_t tokens = {
{Opt_discard, "discard"},
{Opt_nodiscard, "nodiscard"},
{Opt_nologreplay, "nologreplay"},
- {Opt_norecovery, "norecovery"},
{Opt_ratio, "metadata_ratio=%u"},
{Opt_rescan_uuid_tree, "rescan_uuid_tree"},
{Opt_skip_balance, "skip_balance"},
@@ -396,7 +393,6 @@ static const match_table_t tokens = {
/* Deprecated options */
{Opt_alloc_start, "alloc_start=%s"},
- {Opt_recovery, "recovery"},
{Opt_subvolrootid, "subvolrootid=%d"},
/* Debugging options */
@@ -664,7 +660,6 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
btrfs_clear_and_info(info, NOTREELOG,
"enabling tree log");
break;
- case Opt_norecovery:
case Opt_nologreplay:
btrfs_set_and_info(info, NOLOGREPLAY,
"disabling log replay at mount time");
@@ -753,10 +748,6 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
btrfs_clear_and_info(info, AUTO_DEFRAG,
"disabling auto defrag");
break;
- case Opt_recovery:
- btrfs_warn(info,
- "'recovery' is deprecated, use 'usebackuproot' instead");
- /* fall through */
case Opt_usebackuproot:
btrfs_info(info,
"trying to use backup root at mount time");
--
2.20.1
next prev parent reply other threads:[~2019-01-21 7:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 6:27 [PATCH v2 0/3] btrfs: Introduce new rescue= mount options Qu Wenruo
2019-01-21 6:27 ` Qu Wenruo [this message]
2019-01-21 6:27 ` [PATCH v2 2/3] btrfs: Introduce "rescue=" mount option Qu Wenruo
2019-01-21 6:27 ` [PATCH v2 3/3] btrfs: Introduce new mount option to skip block group items scan Qu Wenruo
2019-01-21 7:35 [PATCH v2 0/3] btrfs: Introduce new rescue= mount options Qu Wenruo
2019-01-21 7:35 ` [PATCH v2 1/3] btrfs: Remove "recovery" mount option Qu Wenruo
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=20190121062718.8063-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@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).