[2/2] btrfs: remove deprecated mount option subvolrootid

Commit Message

David Sterba July 1, 2020, 3:16 p.m. UTC

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 <[e-mail]>
---
 fs/btrfs/super.c | 6 ------
 1 file changed, 6 deletions(-)

Patch

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 7e204b42076d..f90ee35465ab 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -349,7 +349,6 @@  enum {
 
 	/* Deprecated options */
 	Opt_recovery,
-	Opt_subvolrootid,
 
 	/* Debugging options */
 	Opt_check_integrity,
@@ -421,7 +420,6 @@  static const match_table_t tokens = {
 
 	/* Deprecated options */
 	{Opt_recovery, "recovery"},
-	{Opt_subvolrootid, "subvolrootid=%d"},
 
 	/* Debugging options */
 	{Opt_check_integrity, "check_int"},
@@ -540,7 +538,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
@@ -1087,9 +1084,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;
 		}