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 <dsterba@suse.com>

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 01bad704ff81cf557a3cf5c35105396b259002bd..7c052a542412c40c806a975607275f9d826a68a6 100644 (file)
--- 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;
                }