Revert "btrfs: enable unprivileged snapshots"

This reverts commit 2d66f57109b542b7a7a4882db74658374d2b5745.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index c94abff1cbcbef92994c634ac4f6fbc7d5f65823..829c28040b3234e5ff24b2978accd2301eff0da8 100644 (file)
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -432,28 +432,17 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
        if (bdevtype && strcmp(orig->type, "btrfs") == 0 &&
            strcmp(new->type, "btrfs") == 0 &&
            btrfs_same_fs(orig->dest, new->dest) == 0) {
-               struct rsync_data_char arg;
-
                if (btrfs_destroy(new) < 0) {
                        ERROR("Error destroying %s subvolume", new->dest);
                        goto err;
                }
-
                if (mkdir_p(new->dest, 0755) < 0) {
                        ERROR("Error creating %s directory", new->dest);
                        goto err;
                }
-
-               arg.src = orig->dest;
-               arg.dest = new->dest;
-               if (am_unpriv())
-                       ret = userns_exec_1(c0->lxc_conf, btrfs_snapshot_wrapper,
-                                         &arg, "btrfs_snapshot_wrapper");
-               else
-                       ret = btrfs_snapshot(orig->dest, new->dest);
-               if (ret < 0) {
-                       SYSERROR("Failed to create btrfs snapshot \"%s\" of \"%s\"",
-                                new->dest, orig->dest);
+               if (btrfs_snapshot(orig->dest, new->dest) < 0) {
+                       ERROR("Error restoring %s to %s", orig->dest,
+                             new->dest);
                        goto err;
                }
                bdev_put(orig);