Revert "storage: prefix all nbd paths"

This reverts commit bdca6500054d3df9f704bcc5fe5d66f3837cce1b.

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

diff --git a/src/lxc/bdev/lxcnbd.c b/src/lxc/bdev/lxcnbd.c
index 0205989c6cc3038f84c1f00f1229fbd09a434fd5..894343df0d6cbdb70d23c2c82df4924cc7a8af52 100644 (file)
--- a/src/lxc/bdev/lxcnbd.c
+++ b/src/lxc/bdev/lxcnbd.c
@@ -116,21 +116,17 @@ int nbd_detect(const char *path)
 int nbd_mount(struct bdev *bdev)
 {
        int ret = -1, partition;
-       char *src;
        char path[50];
 
        if (strcmp(bdev->type, "nbd"))
                return -22;
-
        if (!bdev->src || !bdev->dest)
                return -22;
 
        /* nbd_idx should have been copied by bdev_init from the lxc_conf */
        if (bdev->nbd_idx < 0)
                return -22;
-
-       src = lxc_storage_get_path(bdev->src, bdev->type);
-       partition = nbd_get_partition(src);
+       partition = nbd_get_partition(bdev->src);
        if (partition)
                ret = snprintf(path, 50, "/dev/nbd%dp%d", bdev->nbd_idx,
                                partition);
@@ -155,13 +151,14 @@ int nbd_mount(struct bdev *bdev)
 
 int nbd_umount(struct bdev *bdev)
 {
+       int ret;
+
        if (strcmp(bdev->type, "nbd"))
                return -22;
-
        if (!bdev->src || !bdev->dest)
                return -22;
-
-       return umount(bdev->dest);
+       ret = umount(bdev->dest);
+       return ret;
 }
 
 bool requires_nbd(const char *path)