]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: remove standalone "nologreplay" mount option
authorQu Wenruo <wqu@suse.com>
Wed, 14 May 2025 03:41:03 +0000 (13:11 +0930)
committerDavid Sterba <dsterba@suse.com>
Fri, 16 May 2025 17:16:22 +0000 (19:16 +0200)
Standalone "nologreplay" mount option has been marked deprecated since
commit 74ef00185eb8 ("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: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/super.c

index 5221bfd1706a82939b393bd953113255f8a29a6e..a0c65adce1abd23c02cdb46fa95920bfa14dd091 100644 (file)
@@ -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'");