btrfs-progs: subvolme: remove unused options for create and snapshot
PATCH 1/2 btrfs-progs: subvolme: remove unused options for create and snapshot
There are options '-c' in create subvolume and '-c' and '-x' in snapshot. And the codes about them is there, but not in the manual or help. This codes should be removed to avoid confusion.
--- cmds/subvolume.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
cmds/subvolume.c +2 -23
@@ -108,18 +108,11 @@ static int cmd_subvol_create(const struct cmd_struct *cmd, optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:" ); +int c =getopt (argc, argv,"i:" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {
@@ -541,18 +534,11 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,memset (&args,0 ,sizeof (args)); optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:r" ); +int c =getopt (argc, argv,"i:r" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {
@@ -563,13 +549,6 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,case 'r' : readonly =1 ;break ; -case 'x' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,1 ); -if (res) { - retval = res; - goto out; - } -break ;default :usage_unknown_option (cmd, argv); }
Signature · 1 line
2.25.1
PATCH 2/2 btrfs-progs: qgroup: remove unused btrfs_qgroup_inherit_add_group()
The function btrfs_qgroup_inherit_add_group() was used for options in create subvolume '-c' or snapshot '-c' or '-x' command. These options are deleted and the function is not needed everywhere now. So we can delete it.
--- cmds/qgroup.c | 41 ----------------------------------------- cmds/qgroup.h | 2 -- 2 files changed, 43 deletions(-)
cmds/qgroup.c +0 -41
@@ -1477,47 +1477,6 @@ int btrfs_qgroup_inherit_add_group(struct btrfs_qgroup_inherit **inherit, char *return 0 ; } -int btrfs_qgroup_inherit_add_copy (struct btrfs_qgroup_inherit **inherit,char *arg, -int type) -{ -int ret; -u64 qgroup_src; -u64 qgroup_dst; -char *p; -int pos =0 ; - - p =strchr (arg,':' ); -if (!p) { -bad: -error ("invalid copy specification, missing separator :" ); -return -EINVAL ; - } - *p =0 ; - qgroup_src =parse_qgroupid_or_path (arg); - qgroup_dst =parse_qgroupid_or_path (p +1 ); - *p =':' ; - -if (!qgroup_src || !qgroup_dst) - goto bad; - -if (*inherit) - pos = (*inherit)->num_qgroups + - (*inherit)->num_ref_copies *2 * type; - - ret =qgroup_inherit_realloc (inherit,2 , pos); -if (ret) -return ret; - - (*inherit)->qgroups[pos++] = qgroup_src; - (*inherit)->qgroups[pos++] = qgroup_dst; - -if (!type) - ++(*inherit)->num_ref_copies; -else - ++(*inherit)->num_excl_copies; - -return 0 ; -}static const char *const qgroup_cmd_group_usage[] = {"btrfs qgroup <command> [options] <path>" ,NULL
cmds/qgroup.h +0 -2
@@ -38,8 +38,6 @@ struct btrfs_qgroup_stats {int btrfs_qgroup_inherit_size (struct btrfs_qgroup_inherit *p);int btrfs_qgroup_inherit_add_group (struct btrfs_qgroup_inherit **inherit,char *arg); -int btrfs_qgroup_inherit_add_copy (struct btrfs_qgroup_inherit **inherit,char *arg, -int type);int btrfs_qgroup_query (int fd,u64 qgroupid,struct btrfs_qgroup_stats *stats);#endif
Signature · 1 line
2.25.1
Quoted 3 lines · Sidong Yang
There are options '-c' in create subvolume and '-c' and '-x' in snapshot. And the codes about them is there, but not in the manual or help. This codes should be removed to avoid confusion.
I'd like more explanation on why we don't use it.
In fact the truth is, those -c/-x allows us to directly copy qgroup numbers from other subvolumes when creating subvolume.
This is definitely going to screw up qgroup numbers.
Nowadays btrfs qgroup will automatically inherit the qgroup numbers when -i option is used.
So the old -c/-x is no longer needed, and any inexperienced usage of them will lead to inconsistent qgroup numbers anyway.
Thanks,
Qu
Quoted 64 lines
Signed-off-by Sidong Yang <[email protected]>--- cmds/subvolume.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)cmds/subvolume.c +2
-23@@ -108,18 +108,11 @@ static int cmd_subvol_create(const struct cmd_struct *cmd, optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:" ); +int c =getopt (argc, argv,"i:" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -541,18 +534,11 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,memset (&args,0 ,sizeof (args)); optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:r" ); +int c =getopt (argc, argv,"i:r" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -563,13 +549,6 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,case 'r' : readonly =1 ;break ; -case 'x' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,1 ); -if (res) { - retval = res; - goto out; - } -break ;default :usage_unknown_option (cmd, argv); }
Quoted 7 lines · Qu Wenruo
Quoted 3 lines · Sidong Yang
There are options '-c' in create subvolume and '-c' and '-x' in snapshot. And the codes about them is there, but not in the manual or help. This codes should be removed to avoid confusion.
Quoted 6 lines
I'd like more explanation on why we don't use it.
In fact the truth is, those -c/-x allows us to directly copy qgroup numbers from other subvolumes when creating subvolume.
This is definitely going to screw up qgroup numbers.
Actually, I don't understand that you said this option screw up qgroup numbers. Could you explain more?
I checked that -c/-x options are not working. The commands are like below.
# btrfs qgroup create 1/0 /mnt # btrfs qgroup create 1/1 /mnt # btrfs subvol create -c 1/0:1/1 /mnt/a
But it's not working. It seems that it ignores btrfs_qgroup_inherit argument. New subvolume doesn't inherit anything.
Quoted 3 lines
Nowadays btrfs qgroup will automatically inherit the qgroup numbers when -i option is used.
Totally agree. -i option is enough to use.
Thanks,
Sidong
Quoted 71 lines
So the old -c/-x is no longer needed, and any inexperienced usage of them will lead to inconsistent qgroup numbers anyway.
Thanks,
QuQuoted 64 lines
Signed-off-by Sidong Yang <[email protected]>--- cmds/subvolume.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)cmds/subvolume.c +2
-23@@ -108,18 +108,11 @@ static int cmd_subvol_create(const struct cmd_struct *cmd, optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:" ); +int c =getopt (argc, argv,"i:" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -541,18 +534,11 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,memset (&args,0 ,sizeof (args)); optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:r" ); +int c =getopt (argc, argv,"i:r" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -563,13 +549,6 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,case 'r' : readonly =1 ;break ; -case 'x' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,1 ); -if (res) { - retval = res; - goto out; - } -break ;default :usage_unknown_option (cmd, argv); }
Quoted 20 lines · Sidong Yang
Quoted 7 lines · Qu Wenruo
Quoted 3 lines · Sidong Yang
There are options '-c' in create subvolume and '-c' and '-x' in snapshot. And the codes about them is there, but not in the manual or help. This codes should be removed to avoid confusion.
Quoted 6 lines
I'd like more explanation on why we don't use it.
In fact the truth is, those -c/-x allows us to directly copy qgroup numbers from other subvolumes when creating subvolume.
This is definitely going to screw up qgroup numbers.
Actually, I don't understand that you said this option screw up qgroup numbers. Could you explain more?
I checked that -c/-x options are not working. The commands are like below.
Quoted 6 lines
# btrfs qgroup create 1/0 /mnt # btrfs qgroup create 1/1 /mnt # btrfs subvol create -c 1/0:1/1 /mnt/aBut it's not working. It seems that it ignores
btrfs_qgroup_inheritargument. New subvolume doesn't inherit anything.
Those -c/-x is for qgroup refer/exclusive copy.
Check btrfs_qgroup_inherit(), there are two for loops, one for num_ref_copies, the other for num_excl_copies.
In those loops, we just copy the number directly.
(And of course, mark qgroup inconsistent).
Thanks,
Qu
Quoted 80 lines
Quoted 4 lines
Nowadays btrfs qgroup will automatically inherit the qgroup numbers when -i option is used.
Totally agree. -i option is enough to use.
Thanks,
SidongQuoted 71 lines
So the old -c/-x is no longer needed, and any inexperienced usage of them will lead to inconsistent qgroup numbers anyway.
Thanks,
QuQuoted 64 lines
Signed-off-by Sidong Yang <[email protected]>--- cmds/subvolume.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)cmds/subvolume.c +2
-23@@ -108,18 +108,11 @@ static int cmd_subvol_create(const struct cmd_struct *cmd, optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:" ); +int c =getopt (argc, argv,"i:" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -541,18 +534,11 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,memset (&args,0 ,sizeof (args)); optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:r" ); +int c =getopt (argc, argv,"i:r" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -563,13 +549,6 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,case 'r' : readonly =1 ;break ; -case 'x' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,1 ); -if (res) { - retval = res; - goto out; - } -break ;default :usage_unknown_option (cmd, argv); }
Quoted 30 lines · Qu Wenruo
Quoted 20 lines · Sidong Yang
Quoted 7 lines · Qu Wenruo
Quoted 3 lines · Sidong Yang
There are options '-c' in create subvolume and '-c' and '-x' in snapshot. And the codes about them is there, but not in the manual or help. This codes should be removed to avoid confusion.
Quoted 6 lines
I'd like more explanation on why we don't use it.
In fact the truth is, those -c/-x allows us to directly copy qgroup numbers from other subvolumes when creating subvolume.
This is definitely going to screw up qgroup numbers.
Actually, I don't understand that you said this option screw up qgroup numbers. Could you explain more?
I checked that -c/-x options are not working. The commands are like below.Quoted 6 lines
# btrfs qgroup create 1/0 /mnt # btrfs qgroup create 1/1 /mnt # btrfs subvol create -c 1/0:1/1 /mnt/aBut it's not working. It seems that it ignores
btrfs_qgroup_inheritargument. New subvolume doesn't inherit anything.
Quoted 7 lines
Those -c/-x is for qgroup refer/exclusive copy.
Check
btrfs_qgroup_inherit(), there are two for loops, one fornum_ref_copies, the other fornum_excl_copies.In those loops, we just copy the number directly.
(And of course, mark qgroup inconsistent).
I see that it just copies rfer/excl directly. Thanks! I'll add more explaination for next version.
Thanks,
Sidong
Quoted 84 lines
Thanks,
QuQuoted 80 lines
Quoted 4 lines
Nowadays btrfs qgroup will automatically inherit the qgroup numbers when -i option is used.
Totally agree. -i option is enough to use.
Thanks,
SidongQuoted 71 lines
So the old -c/-x is no longer needed, and any inexperienced usage of them will lead to inconsistent qgroup numbers anyway.
Thanks,
QuQuoted 64 lines
Signed-off-by Sidong Yang <[email protected]>--- cmds/subvolume.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)cmds/subvolume.c +2
-23@@ -108,18 +108,11 @@ static int cmd_subvol_create(const struct cmd_struct *cmd, optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:" ); +int c =getopt (argc, argv,"i:" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -541,18 +534,11 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,memset (&args,0 ,sizeof (args)); optind =0 ;while (1 ) { -int c =getopt (argc, argv,"c:i:r" ); +int c =getopt (argc, argv,"i:r" );if (c <0 )break ;switch (c) { -case 'c' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,0 ); -if (res) { - retval = res; - goto out; - } -break ;case 'i' : res =btrfs_qgroup_inherit_add_group (&inherit, optarg);if (res) {@@ -563,13 +549,6 @@ static int cmd_subvol_snapshot(const struct cmd_struct *cmd,case 'r' : readonly =1 ;break ; -case 'x' : - res =btrfs_qgroup_inherit_add_copy (&inherit, optarg,1 ); -if (res) { - retval = res; - goto out; - } -break ;default :usage_unknown_option (cmd, argv); }