@@ -130,10 +130,6 @@ enum {
Opt_ignoredatacsums,
Opt_rescue_all,
- /* Deprecated options */
- Opt_recovery,
- Opt_inode_cache,
-
/* Debugging options */
Opt_enospc_debug,
#ifdef CONFIG_BTRFS_DEBUG
@@ -224,7 +220,6 @@ static const struct fs_parameter_spec btrfs_fs_parameters[] = {
fsparam_string("device", Opt_device),
fsparam_enum("fatal_errors", Opt_fatal_errors, btrfs_parameter_fatal_errors),
fsparam_flag_no("flushoncommit", Opt_flushoncommit),
- fsparam_flag_no("inode_cache", Opt_inode_cache),
fsparam_string("max_inline", Opt_max_inline),
fsparam_flag_no("barrier", Opt_barrier),
fsparam_flag_no("datacow", Opt_datacow),
@@ -255,10 +250,6 @@ static const struct fs_parameter_spec btrfs_fs_parameters[] = {
__fsparam(NULL, "usebackuproot", Opt_usebackuproot, fs_param_deprecated,
NULL),
- /* Deprecated options */
- __fsparam(NULL, "recovery", Opt_recovery,
- fs_param_neg_with_no|fs_param_deprecated, NULL),
-
/* Debugging options */
fsparam_flag_no("enospc_debug", Opt_enospc_debug),
#ifdef CONFIG_BTRFS_DEBUG
@@ -442,28 +433,6 @@ static int btrfs_parse_param(struct fs_context *fc,
else
btrfs_clear_opt(ctx->mount_opt, NOTREELOG);
break;
- case Opt_recovery:
- /*
- * -o recovery used to be an alias for usebackuproot, and then
- * norecovery was an alias for nologreplay, hence the different
- * behaviors for negated and not.
- */
- if (result.negated) {
- btrfs_warn(NULL,
- "'norecovery' is deprecated, use 'rescue=nologreplay' instead");
- btrfs_set_opt(ctx->mount_opt, NOLOGREPLAY);
- } else {
- btrfs_warn(NULL,
- "'recovery' is deprecated, use 'rescue=usebackuproot' instead");
- btrfs_set_opt(ctx->mount_opt, USEBACKUPROOT);
-
- /*
- * If we're loading the backup roots we can't trust the
- * space cache.
- */
- btrfs_set_opt(ctx->mount_opt, CLEAR_CACHE);
- }
- break;
case Opt_nologreplay:
btrfs_warn(NULL,
"'nologreplay' is deprecated, use 'rescue=nologreplay' instead");
@@ -534,10 +503,6 @@ static int btrfs_parse_param(struct fs_context *fc,
case Opt_rescan_uuid_tree:
btrfs_set_opt(ctx->mount_opt, RESCAN_UUID_TREE);
break;
- case Opt_inode_cache:
- btrfs_warn(NULL,
- "the 'inode_cache' option is deprecated and has no effect since 5.11");
- break;
case Opt_clear_cache:
btrfs_set_opt(ctx->mount_opt, CLEAR_CACHE);
break;
We've deprecated these a while ago, go ahead and remove the code for them. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/super.c | 35 ----------------------------------- 1 file changed, 35 deletions(-)