mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
btrfs: remove deprecated mount option subvolrootid
The option subvolrootid used to be a workaround for mounting subvolumes
and ineffective since 5e2a4b25da
("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>
This commit is contained in:
parent
d801e7a355
commit
b90a4ab6ba
1 changed files with 0 additions and 6 deletions
|
@ -348,7 +348,6 @@ enum {
|
||||||
|
|
||||||
/* Deprecated options */
|
/* Deprecated options */
|
||||||
Opt_recovery,
|
Opt_recovery,
|
||||||
Opt_subvolrootid,
|
|
||||||
|
|
||||||
/* Debugging options */
|
/* Debugging options */
|
||||||
Opt_check_integrity,
|
Opt_check_integrity,
|
||||||
|
@ -420,7 +419,6 @@ static const match_table_t tokens = {
|
||||||
|
|
||||||
/* Deprecated options */
|
/* Deprecated options */
|
||||||
{Opt_recovery, "recovery"},
|
{Opt_recovery, "recovery"},
|
||||||
{Opt_subvolrootid, "subvolrootid=%d"},
|
|
||||||
|
|
||||||
/* Debugging options */
|
/* Debugging options */
|
||||||
{Opt_check_integrity, "check_int"},
|
{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:
|
||||||
case Opt_subvol_empty:
|
case Opt_subvol_empty:
|
||||||
case Opt_subvolid:
|
case Opt_subvolid:
|
||||||
case Opt_subvolrootid:
|
|
||||||
case Opt_device:
|
case Opt_device:
|
||||||
/*
|
/*
|
||||||
* These are parsed by btrfs_parse_subvol_options or
|
* 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;
|
*subvol_objectid = subvolid;
|
||||||
break;
|
break;
|
||||||
case Opt_subvolrootid:
|
|
||||||
pr_warn("BTRFS: 'subvolrootid' mount option is deprecated and has no effect\n");
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue