Commit 8af94e77 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: remove standalone "nologreplay" mount option 



Standalone "nologreplay" mount option has been marked deprecated since
commit 74ef0018 ("btrfs: introduce "rescue=" mount option"), which
dates back to v5.9 (2020).

Furthermore there is no other filesystem with the same named mount
option, so this one is btrfs specific and we will not hit the same
problem when removing "norecovery" mount option.

So let's remove the standalone "nologreplay" mount option.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1ce06d45

fs/btrfs/super.c

+0 −8
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ enum { 
	/* Rescue options */

	Opt_rescue,

	Opt_usebackuproot,

	Opt_nologreplay,



	/* Debugging options */

	Opt_enospc_debug,
@@ -246,8 +245,6 @@ static const struct fs_parameter_spec btrfs_fs_parameters[] = { 


	/* Rescue options. */

	fsparam_enum("rescue", Opt_rescue, btrfs_parameter_rescue),

	/* Deprecated, with alias rescue=nologreplay */

	__fsparam(NULL, "nologreplay", Opt_nologreplay, fs_param_deprecated, NULL),

	/* Deprecated, with alias rescue=usebackuproot */

	__fsparam(NULL, "usebackuproot", Opt_usebackuproot, fs_param_deprecated, NULL),

	/* For compatibility only, alias for "rescue=nologreplay". */
@@ -449,11 +446,6 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param) 
		else

			btrfs_clear_opt(ctx->mount_opt, NOTREELOG);

		break;

	case Opt_nologreplay:

		btrfs_warn(NULL,

		"'nologreplay' is deprecated, use 'rescue=nologreplay' instead");

		btrfs_set_opt(ctx->mount_opt, NOLOGREPLAY);

		break;

	case Opt_norecovery:

		btrfs_info(NULL,

"'norecovery' is for compatibility only, recommended to use 'rescue=nologreplay'");