The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1748
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Christian Brauner <[email protected]>
From 3523c848920405178e7857a1a608d3f1a4bd76dd Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Tue, 15 Aug 2017 20:22:21 +0200 Subject: [PATCH] remove: prefixing for stable branch Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/bdev/lxcbtrfs.c | 9 ++------- src/lxc/bdev/lxcdir.c | 10 ++++------ src/lxc/bdev/lxcloop.c | 8 ++++---- src/lxc/bdev/lxclvm.c | 15 ++++----------- src/lxc/bdev/lxcrbd.c | 4 ++-- src/lxc/bdev/lxczfs.c | 8 +++----- 6 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/lxc/bdev/lxcbtrfs.c b/src/lxc/bdev/lxcbtrfs.c index 746099630..f06033e01 100644 --- a/src/lxc/bdev/lxcbtrfs.c +++ b/src/lxc/bdev/lxcbtrfs.c @@ -384,10 +384,7 @@ int btrfs_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, return -1; } - new->src = lxc_string_join( - "/", - (const char *[]){"btrfs:", *lxcpath != '/' ? lxcpath : ++lxcpath, - cname, "rootfs", NULL}, + new->src = lxc_string_join("/", (const char *[]){*lxcpath != '/' ? lxcpath : ++lxcpath, cname, "rootfs", NULL}, false); if (!new->src) { ERROR("Failed to create new rootfs path"); @@ -836,15 +833,13 @@ int btrfs_create(struct bdev *bdev, const char *dest, const char *n, size_t len; len = strlen(dest) + 1; - /* strlen("btrfs:") */ - len += 6; bdev->src = malloc(len); if (!bdev->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(bdev->src, len, "btrfs:%s", dest); + ret = snprintf(bdev->src, len, "%s", dest); if (ret < 0 || (size_t)ret >= len) { ERROR("Failed to create string"); return -1; diff --git a/src/lxc/bdev/lxcdir.c b/src/lxc/bdev/lxcdir.c index ee1aea25a..e2cee1024 100644 --- a/src/lxc/bdev/lxcdir.c +++ b/src/lxc/bdev/lxcdir.c @@ -51,14 +51,14 @@ int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, if (!orig->dest || !orig->src) return -1; - len = strlen(lxcpath) + strlen(cname) + strlen("rootfs") + 4 + 3; + len = strlen(lxcpath) + strlen(cname) + strlen("rootfs") + 3; new->src = malloc(len); if (!new->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(new->src, len, "dir:%s/%s/rootfs", lxcpath, cname); + ret = snprintf(new->src, len, "%s/%s/rootfs", lxcpath, cname); if (ret < 0 || (size_t)ret >= len) { ERROR("Failed to create string"); return -1; @@ -82,21 +82,19 @@ int dir_create(struct bdev *bdev, const char *dest, const char *n, const char *src; size_t len; - /* strlen("dir:") */ - len = 4; if (specs && specs->dir) src = specs->dir; else src = dest; - len += strlen(src) + 1; + len = strlen(src) + 1; bdev->src = malloc(len); if (!bdev->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(bdev->src, len, "dir:%s", src); + ret = snprintf(bdev->src, len, "%s", src); if (ret < 0 || (size_t)ret >= len) { ERROR("Failed to create string"); return -1; diff --git a/src/lxc/bdev/lxcloop.c b/src/lxc/bdev/lxcloop.c index e5f14bb78..8ace4265e 100644 --- a/src/lxc/bdev/lxcloop.c +++ b/src/lxc/bdev/lxcloop.c @@ -73,13 +73,13 @@ int loop_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, return -1; } - new->src = malloc(len + 5); + new->src = malloc(len); if (!new->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(new->src, (len + 5), "loop:%s", srcdev); + ret = snprintf(new->src, len, "%s", srcdev); if (ret < 0 || ret >= (len + 5)) { ERROR("Failed to create string"); return -1; @@ -158,13 +158,13 @@ int loop_create(struct bdev *bdev, const char *dest, const char *n, return -1; } - bdev->src = malloc(len + 5); + bdev->src = malloc(len); if (!bdev->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(bdev->src, len + 5, "loop:%s", srcdev); + ret = snprintf(bdev->src, len, "%s", srcdev); if (ret < 0 || ret >= len + 5) { ERROR("Failed to create string"); return -1; diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c index 98a69c647..6eac691d9 100644 --- a/src/lxc/bdev/lxclvm.c +++ b/src/lxc/bdev/lxclvm.c @@ -389,10 +389,7 @@ int lvm_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, if (strcmp(orig->type, "lvm")) { vg = lxc_global_config_value("lxc.bdev.lvm.vg"); - new->src = lxc_string_join( - "/", - (const char *[]){"lvm:", "dev", vg, cname, NULL}, - false); + new->src = lxc_string_join("/", (const char *[]){"dev", vg, cname, NULL}, false); } else { char *dup, *slider, *src; @@ -413,11 +410,7 @@ int lvm_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, *slider = '\0'; slider = dup; - new->src = lxc_string_join( - "/", - (const char *[]){"lvm:", *slider == '/' ? ++slider : slider, - cname, NULL}, - false); + new->src = lxc_string_join("/", (const char *[]){*slider == '/' ? ++slider : slider, cname, NULL}, false); free(dup); } if (!new->src) { @@ -590,14 +583,14 @@ int lvm_create(struct bdev *bdev, const char *dest, const char *n, if (specs->lvm.lv) lv = specs->lvm.lv; - len = strlen(vg) + strlen(lv) + 4 + 7; + len = strlen(vg) + strlen(lv) + 7; bdev->src = malloc(len); if (!bdev->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(bdev->src, len, "lvm:/dev/%s/%s", vg, lv); + ret = snprintf(bdev->src, len, "/dev/%s/%s", vg, lv); if (ret < 0 || ret >= len) { ERROR("Failed to create string"); return -1; diff --git a/src/lxc/bdev/lxcrbd.c b/src/lxc/bdev/lxcrbd.c index 7f1c0f583..0c7611508 100644 --- a/src/lxc/bdev/lxcrbd.c +++ b/src/lxc/bdev/lxcrbd.c @@ -111,14 +111,14 @@ int rbd_create(struct bdev *bdev, const char *dest, const char *n, rbdname = specs->rbd.rbdname; /* source device /dev/rbd/lxc/ctn */ - len = strlen(rbdpool) + strlen(rbdname) + 4 + 11; + len = strlen(rbdpool) + strlen(rbdname) + 11; bdev->src = malloc(len); if (!bdev->src) { ERROR("Failed to allocate memory"); return -1; } - ret = snprintf(bdev->src, len, "rbd:/dev/rbd/%s/%s", rbdpool, rbdname); + ret = snprintf(bdev->src, len, "/dev/rbd/%s/%s", rbdpool, rbdname); if (ret < 0 || ret >= len) { ERROR("Failed to create string"); return -1; diff --git a/src/lxc/bdev/lxczfs.c b/src/lxc/bdev/lxczfs.c index 22db5d5c5..86b4d5f23 100644 --- a/src/lxc/bdev/lxczfs.c +++ b/src/lxc/bdev/lxczfs.c @@ -219,12 +219,12 @@ int zfs_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, return -1; } - len = strlen(lxcpath) + strlen(cname) + strlen("rootfs") + 4 + 3; + len = strlen(lxcpath) + strlen(cname) + strlen("rootfs") + 3; new->src = malloc(len); if (!new->src) return -1; - ret = snprintf(new->src, len, "zfs:%s/%s/rootfs", lxcpath, cname); + ret = snprintf(new->src, len, "%s/%s/rootfs", lxcpath, cname); if (ret < 0 || ret >= len) return -1; @@ -303,13 +303,11 @@ int zfs_create(struct bdev *bdev, const char *dest, const char *n, } len = strlen(bdev->dest) + 1; - /* strlen("zfs:") */ - len += 4; bdev->src = malloc(len); if (!bdev->src) return -1; - ret = snprintf(bdev->src, len, "zfs:%s", bdev->dest); + ret = snprintf(bdev->src, len, "%s", bdev->dest); if (ret < 0 || (size_t)ret >= len) return -1;
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
