RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-06 12:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: subvol delete: try to delete subvolume by id when its path can't be resolved

Browse Source 
There is a recent report of ghost subvolumes where such subvolumes has
no ROOT_REF/BACKREF, and 0 root ref.  But without an orphan item, thus
kernel won't queue them for cleanup.

Such ghost subvolumes are just here to take up space, and no way to
delete them except by btrfs check, which will try to fix the problem by
adding orphan item.

There is a kernel patch submitted to allow btrfs to detect such ghost
subvolumes and queue them for cleanup.

But btrfs-progs will not continue to call the ioctl if it can't find the
full subvolume path.

Thus this patch will loose the restriction by allowing btrfs-progs to
continue to call the ioctl even if it can't grab the subvolume path.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2021-06-28 18:26:28 +08:00 committed by David Sterba
parent a138daac17
commit 9d5d3de01c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmds/subvolume.c
View File

@ -258,6 +258,7 @@ static int cmd_subvol_delete(const struct cmd_struct *cmd,
char *path = NULL;
DIR *dirstream = NULL;
int commit_mode = 0;
bool subvol_path_not_found = false;
u8 fsid[BTRFS_FSID_SIZE];
u64 subvolid = 0;
char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
@ -319,6 +320,18 @@ static int cmd_subvol_delete(const struct cmd_struct *cmd,
path = argv[cnt];
err = btrfs_util_subvolume_path(path, subvolid, &subvol);
/*
* If the subvolume is really not referred by anyone, and refs
* is 0, newer kernel can handle it by just adding an orphan
* item and queue it for cleanup.
*
* In this case, just let kernel to handle it, we do no extra
* handling.
*/
if (err == BTRFS_UTIL_ERROR_SUBVOLUME_NOT_FOUND) {
subvol_path_not_found = true;
goto again;
}
if (err) {
error_btrfs_util(err);
ret = 1;
@ -395,8 +408,10 @@ again:
if (subvolid == 0)
pr_verbose(MUST_LOG, "'%s/%s'\n", dname, vname);
else
else if (!subvol_path_not_found)
pr_verbose(MUST_LOG, "'%s'\n", full_subvolpath);
else
pr_verbose(MUST_LOG, "subvolid=%llu\n", subvolid);
if (subvolid == 0)
err = btrfs_util_delete_subvolume_fd(fd, vname, 0);