From 9da773aa46ba33a9c3bdd83b31e15b031b3bfe4d Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 4 Dec 2023 20:06:04 +0100 Subject: [PATCH] btrfs-progs: subvol delete: add options to delete the qgroup The 0/subvolid qgroups are not automatically deleted when the subvolume is deleted, for historical reasons. There's a command to clean up all such stale qgroups (btrfs qgroup clean-stale) but this should be also possible with the subvolume deletion. With the options we can switch the default to delete the qgroup by default eventually, if somebody depends on the not deleting behaviour the negation option can be used. Issue: #366 Signed-off-by: David Sterba --- Documentation/btrfs-subvolume.rst | 7 +++++++ cmds/subvolume.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Documentation/btrfs-subvolume.rst b/Documentation/btrfs-subvolume.rst index eb116c4b..9c808ccc 100644 --- a/Documentation/btrfs-subvolume.rst +++ b/Documentation/btrfs-subvolume.rst @@ -112,6 +112,13 @@ delete [options] [ [...]], delete -i|--subvolid -i|--subvolid subvolume id to be removed instead of the that should point to the filesystem with the subvolume + + --delete-qgroup + also delete the qgroup 0/subvolid if it exists + + --no-delete-qgroup + do not delete the 0/subvolid qgroup (default) + -v|--verbose (deprecated) alias for global *-v* option diff --git a/cmds/subvolume.c b/cmds/subvolume.c index c9aac439..95044eb1 100644 --- a/cmds/subvolume.c +++ b/cmds/subvolume.c @@ -334,6 +334,8 @@ static const char * const cmd_subvolume_delete_usage[] = { OPTLINE("-c|--commit-after", "wait for transaction commit at the end of the operation"), OPTLINE("-C|--commit-each", "wait for transaction commit after deleting each subvolume"), OPTLINE("-i|--subvolid", "subvolume id of the to be removed subvolume"), + OPTLINE("--delete-qgroup", "also delete the qgroup 0/subvolid if it exists"), + OPTLINE("--no-delete-qgroup", "do not delete the qgroup 0/subvolid if it exists (default)"), OPTLINE("-v|--verbose", "deprecated, alias for global -v option"), HELPINFO_INSERT_GLOBALS, HELPINFO_INSERT_VERBOSE, @@ -362,15 +364,20 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a enum { COMMIT_AFTER = 1, COMMIT_EACH = 2 }; enum btrfs_util_error err; uint64_t default_subvol_id, target_subvol_id = 0; + bool opt_delete_qgroup = false; optind = 0; while (1) { int c; + enum { GETOPT_VAL_DELETE_QGROUP = GETOPT_VAL_FIRST, + GETOPT_VAL_NO_DELETE_QGROUP }; static const struct option long_options[] = { {"commit-after", no_argument, NULL, 'c'}, {"commit-each", no_argument, NULL, 'C'}, {"subvolid", required_argument, NULL, 'i'}, {"verbose", no_argument, NULL, 'v'}, + {"delete-qgroup", no_argument, NULL, GETOPT_VAL_DELETE_QGROUP }, + {"no-delete-qgroup", no_argument, NULL, GETOPT_VAL_NO_DELETE_QGROUP }, {NULL, 0, NULL, 0} }; @@ -391,6 +398,12 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a case 'v': bconf_be_verbose(); break; + case GETOPT_VAL_DELETE_QGROUP: + opt_delete_qgroup = true; + break; + case GETOPT_VAL_NO_DELETE_QGROUP: + opt_delete_qgroup = false; + break; default: usage_unknown_option(cmd, argv); } @@ -525,6 +538,19 @@ again: warning("deletion failed with EPERM, you don't have permissions or send may be in progress"); ret = 1; goto out; + } else if (opt_delete_qgroup) { + struct btrfs_ioctl_qgroup_create_args args = { .qgroupid = target_subvol_id }; + + ret = ioctl(fd, BTRFS_IOC_QGROUP_CREATE, &args); + if (ret == 0) { + pr_verbose(LOG_DEFAULT, "Delete qgroup 0/%" PRIu64 "\n", target_subvol_id); + } else if (ret < 0 && (errno == ENOTCONN || errno == ENOENT)) { + /* Quotas not enabled, or there's no qgroup. */ + } else { + warning("unable to delete qgroup 0/%llu: %m", subvolid); + } + /* Qgroup errors are not fatal. */ + ret = 0; } if (commit_mode == COMMIT_EACH) {