proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 09:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix btrfs_recursive_destroy

Browse Source 
A change in kernel 4.2 caused btrfs_recursive_destroy to
fail to delete unprivileged containers.  This patch restores
the pre-kernel-4.2 behaviour.  Ref: Issue 935.

Signed-off-by: Oleg Freedhom <overlayfs@gmail.com>
This commit is contained in:
Oleg Freedhom 2016-04-02 16:18:54 +00:00
parent 55c91e8367
commit 8ba6dc5e53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/bdev/lxcbtrfs.c
View File

@ -616,8 +616,13 @@ static int btrfs_recursive_destroy(const char *path)
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
if (ret < 0) { if (ret < 0) {
close(fd); close(fd);
ERROR("Error: can't perform the search under %s\n", path);
free_btrfs_tree(tree); free_btrfs_tree(tree);
if (errno == EPERM || errno == EACCES) {
WARN("Warn: can't perform the search under %s. Will simply try removing", path);
goto ignore_search;
}
ERROR("Error: can't perform the search under %s\n", path);
return -1; return -1;
} }
if (sk->nr_items == 0) if (sk->nr_items == 0)