Revert "storage: add arg to create_snapshot()"

This reverts commit a3e85dae4e02ad9d3b8fcf6bf301907ef55a7c01.

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

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index 161d1750b78e0f4e3b92c60aa804cb9c2271f587..b00366ea4750dc37e156e6f7d46ac615f2e55c6a 100644 (file)
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -436,7 +436,7 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
        if (!strcmp(orig->type, "btrfs") && !strcmp(new->type, "btrfs")) {
                bool bret = false;
                if (snap || btrfs_same_fs(orig->dest, new->dest) == 0)
-                       bret = new->ops->create_snapshot(c0->lxc_conf, orig, new, 0);
+                       bret = new->ops->create_snapshot(c0->lxc_conf, orig, new);
                else
                        bret = new->ops->create_clone(c0->lxc_conf, orig, new, 0);
                if (!bret)

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/bdev/bdev.h
index 15d46502f087d4d29a12238e8d7cfc613d1be980..5a14e33763136096ba818f7feda1d4711bd65d61 100644 (file)
--- a/src/lxc/bdev/bdev.h
+++ b/src/lxc/bdev/bdev.h
@@ -76,7 +76,7 @@ struct bdev_ops {
        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, uint64_t newsize);
+                               struct bdev *new);
        bool can_snapshot;
        bool can_backup;
 };

diff --git a/src/lxc/bdev/lxcbtrfs.c b/src/lxc/bdev/lxcbtrfs.c
index 2eaf27e86d11ec277d2f84ac200673c6f69e01f7..d4685621b1c385bff04510af427b1f540cb96fb0 100644 (file)
--- a/src/lxc/bdev/lxcbtrfs.c
+++ b/src/lxc/bdev/lxcbtrfs.c
@@ -464,7 +464,7 @@ bool btrfs_create_clone(struct lxc_conf *conf, struct bdev *orig,
 }
 
 bool btrfs_create_snapshot(struct lxc_conf *conf, struct bdev *orig,
-                          struct bdev *new, uint64_t newsize)
+                          struct bdev *new)
 {
        int ret;
 

diff --git a/src/lxc/bdev/lxcbtrfs.h b/src/lxc/bdev/lxcbtrfs.h
index 0069245e8e0d848bb29975a8317c8cf56e6308ce..13b48399405bec5e01dfeda959584ef3c1721bdd 100644 (file)
--- a/src/lxc/bdev/lxcbtrfs.h
+++ b/src/lxc/bdev/lxcbtrfs.h
@@ -416,6 +416,6 @@ int btrfs_snapshot_wrapper(void *data);
 bool btrfs_create_clone(struct lxc_conf *conf, struct bdev *orig,
                        struct bdev *new, uint64_t newsize);
 bool btrfs_create_snapshot(struct lxc_conf *conf, struct bdev *orig,
-                          struct bdev *new, uint64_t newsize);
+                          struct bdev *new);
 
 #endif // __LXC_BTRFS_H