From b90a4ab6ba9cce79a1ac06a250d5fc8c3dff382b Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 1 Jul 2020 17:08:43 +0200 Subject: [PATCH] btrfs: remove deprecated mount option subvolrootid The option subvolrootid used to be a workaround for mounting subvolumes and ineffective since 5e2a4b25da23 ("btrfs: deprecate subvolrootid mount option"). We have subvol= that works and we don't need to keep the cruft, let's remove it. Signed-off-by: David Sterba --- fs/btrfs/super.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 01bad704ff81..7c052a542412 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -348,7 +348,6 @@ enum { /* Deprecated options */ Opt_recovery, - Opt_subvolrootid, /* Debugging options */ Opt_check_integrity, @@ -420,7 +419,6 @@ static const match_table_t tokens = { /* Deprecated options */ {Opt_recovery, "recovery"}, - {Opt_subvolrootid, "subvolrootid=%d"}, /* Debugging options */ {Opt_check_integrity, "check_int"}, @@ -534,7 +532,6 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, case Opt_subvol: case Opt_subvol_empty: case Opt_subvolid: - case Opt_subvolrootid: case Opt_device: /* * These are parsed by btrfs_parse_subvol_options or @@ -1081,9 +1078,6 @@ static int btrfs_parse_subvol_options(const char *options, char **subvol_name, *subvol_objectid = subvolid; break; - case Opt_subvolrootid: - pr_warn("BTRFS: 'subvolrootid' mount option is deprecated and has no effect\n"); - break; default: break; } -- GitLab