Revert "storage: add create_{clone,snapshot}()"

This reverts commit 667fa8cef1afc88bbe20c04523521556cb2946ac.

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

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index 931885b3da1f721bccfd20fe5f0096179e59b020..a99a0517745f97e3061ba7b1a27e71b43ee4d7e8 100644 (file)
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -82,8 +82,6 @@ static const struct bdev_ops aufs_ops = {
     .clone_paths = &aufs_clonepaths,
     .destroy = &aufs_destroy,
     .create = &aufs_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = true,
 };
@@ -96,8 +94,6 @@ static const struct bdev_ops btrfs_ops = {
     .clone_paths = &btrfs_clonepaths,
     .destroy = &btrfs_destroy,
     .create = &btrfs_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = true,
 };
@@ -110,8 +106,6 @@ static const struct bdev_ops dir_ops = {
     .clone_paths = &dir_clonepaths,
     .destroy = &dir_destroy,
     .create = &dir_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = false,
     .can_backup = true,
 };
@@ -124,8 +118,6 @@ static const struct bdev_ops loop_ops = {
     .clone_paths = &loop_clonepaths,
     .destroy = &loop_destroy,
     .create = &loop_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = false,
     .can_backup = true,
 };
@@ -138,8 +130,6 @@ static const struct bdev_ops lvm_ops = {
     .clone_paths = &lvm_clonepaths,
     .destroy = &lvm_destroy,
     .create = &lvm_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = false,
 };
@@ -152,8 +142,6 @@ const struct bdev_ops nbd_ops = {
     .clone_paths = &nbd_clonepaths,
     .destroy = &nbd_destroy,
     .create = &nbd_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = false,
 };
@@ -166,8 +154,6 @@ static const struct bdev_ops ovl_ops = {
     .clone_paths = &ovl_clonepaths,
     .destroy = &ovl_destroy,
     .create = &ovl_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = true,
 };
@@ -180,8 +166,6 @@ static const struct bdev_ops rbd_ops = {
     .clone_paths = &rbd_clonepaths,
     .destroy = &rbd_destroy,
     .create = &rbd_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = false,
     .can_backup = false,
 };
@@ -194,8 +178,6 @@ static const struct bdev_ops zfs_ops = {
     .clone_paths = &zfs_clonepaths,
     .destroy = &zfs_destroy,
     .create = &zfs_create,
-    .create_clone = NULL,
-    .create_snapshot = NULL,
     .can_snapshot = true,
     .can_backup = true,
 };

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/bdev/bdev.h
index 5a14e33763136096ba818f7feda1d4711bd65d61..22133173aefeb8a0a80e135d4267c9bc878abaa9 100644 (file)
--- a/src/lxc/bdev/bdev.h
+++ b/src/lxc/bdev/bdev.h
@@ -73,10 +73,6 @@ struct bdev_ops {
                           const char *oldname, const char *cname,
                           const char *oldpath, const char *lxcpath, int snap,
                           uint64_t newsize, struct lxc_conf *conf);
-       bool (*create_clone)(struct lxc_conf *conf, struct bdev *orig,
-                            struct bdev *new, uint64_t newsize);
-       bool (*create_snapshot)(struct lxc_conf *conf, struct bdev *orig,
-                               struct bdev *new);
        bool can_snapshot;
        bool can_backup;
 };