fix btrfs_recursive_destroy

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>

fix btrfs_recursive_destroy
553aa63d · Oleg Freedhom · Stéphane Graber · 9daa3235 · 553aa63d
Commit 553aa63d authored Apr 02, 2016 by Oleg Freedhom Committed by Stéphane Graber Nov 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

bdev.c src/lxc/bdev.c +6 -1

No files found.
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1767,8 +1767,13 @@ static int btrfs_recursive_destroy(const char *path)
 		ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
 		if (ret < 0) {
 			close(fd);
-			ERROR("Error: can't perform the search under %s\n", path);
 			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;
 		}
 		if (sk->nr_items == 0)