Skip to contentSkip to conversation

Removal of deprecated mount options

PATCH New David Sterba 1 participant 3 messages Jul 1, 2020 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

cover Removal of deprecated mount options

Both options have no effect for a long time, no need to keep them around.

David Sterba (2):
btrfs: remove deprecated mount option alloc_start
btrfs: remove deprecated mount option subvolrootid

 fs/btrfs/super.c | 12 ------------
 1 file changed, 12 deletions(-)
Signature · 1 line
2.25.0
author maintainer
#1 lore raw

PATCH 1/2 btrfs: remove deprecated mount option alloc_start

The mount option alloc_start has no effect since 0d0c71b31720 ("btrfs:
obsolete and remove mount option alloc_start") which has details why it's been deprecated. We can remove it.

---
 fs/btrfs/super.c | 6 ------
 1 file changed, 6 deletions(-)
fs/btrfs/super.c +0 -6
index 3c9ebd4f2b61..7e204b42076d 100644
@@ -348,7 +348,6 @@ enum {
 	Opt_rescue_skipbg,
 
 	/* Deprecated options */
-	Opt_alloc_start,
 	Opt_recovery,
 	Opt_subvolrootid,
 
@@ -421,7 +420,6 @@ static const match_table_t tokens = {
 	{Opt_usebackuproot, "usebackuproot"},
 
 	/* Deprecated options */
-	{Opt_alloc_start, "alloc_start=%s"},
 	{Opt_recovery, "recovery"},
 	{Opt_subvolrootid, "subvolrootid=%d"},
 
@@ -726,10 +724,6 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
 				goto out;
 			}
 			break;
-		case Opt_alloc_start:
-			btrfs_info(info,
-				"option alloc_start is obsolete, ignored");
-			break;
 		case Opt_acl:
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
 			info->sb->s_flags |= SB_POSIXACL;
Signature · 1 line
2.25.0
author maintainer
#2 lore raw

PATCH 2/2 btrfs: remove deprecated mount option subvolrootid

In reply to David Sterba

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.

---
 fs/btrfs/super.c | 6 ------
 1 file changed, 6 deletions(-)
fs/btrfs/super.c +0 -6
index 7e204b42076d..f90ee35465ab 100644
@@ -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;
 		}
Signature · 1 line
2.25.0