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>

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index 3c338c6048939d650ea57e918b087041f973eb87..1659899472c8acea26440f6e33d300986599a247 100644 (file)
--- 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)