Remove td_image.private.

Not needed on the datapath because of the vreq->vbd map. (Meaning that
ultimately driver and image could event be merged (again), if vbd
image lists get ever out of fashion.)

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/drivers/block-lcache.c b/drivers/block-lcache.c
index 083cf346a2c33c9cb73070617eb98672748abc0b..cf9514db67b9c30e684edf74d4bb0f00b70da598 100644 (file)
--- a/drivers/block-lcache.c
+++ b/drivers/block-lcache.c
@@ -156,9 +156,13 @@ fail:
 static void
 local_cache_complete_read(local_cache_t *cache, local_cache_request_t *lreq)
 {
-       td_vbd_t *vbd = lreq->treq.image->private;
+       td_vbd_request_t *vreq;
+       td_vbd_t *vbd;
        td_request_t clone;
 
+       vreq = lreq->treq.private;
+       vbd  = vreq->vbd;
+
        if (!lreq->err) {
                size_t sz = lreq->treq.secs << SECTOR_SHIFT;
                memcpy(lreq->treq.buf, lreq->buf, sz);

diff --git a/drivers/tapdisk-image.c b/drivers/tapdisk-image.c
index 5c94242ff69780442547e682d2551824bac8090c..7073d23ed5d3177bc7e097fbf4fda536117b732f 100644 (file)
--- a/drivers/tapdisk-image.c
+++ b/drivers/tapdisk-image.c
@@ -38,7 +38,7 @@
 #define ERR(_err, _f, _a...) tlog_error(_err, _f, ##_a)
 
 td_image_t *
-tapdisk_image_allocate(const char *file, int type, td_flag_t flags, void *private)
+tapdisk_image_allocate(const char *file, int type, td_flag_t flags)
 {
        int err;
        td_image_t *image;
@@ -55,7 +55,6 @@ tapdisk_image_allocate(const char *file, int type, td_flag_t flags, void *privat
 
        image->type    = type;
        image->flags   = flags;
-       image->private = private;
        INIT_LIST_HEAD(&image->next);
 
        return image;

diff --git a/drivers/tapdisk-image.h b/drivers/tapdisk-image.h
index 002cb2d05b3fe82428064b7cffec09d7f4685ef3..71c3b0eb013c01bbefa9aa37347d398a1d5b335f 100644 (file)
--- a/drivers/tapdisk-image.h
+++ b/drivers/tapdisk-image.h
@@ -40,8 +40,6 @@ struct td_image_handle {
        td_driver_t                 *driver;
        td_disk_info_t               info;
 
-       void                        *private;
-
        struct list_head             next;
 
        /*
@@ -64,7 +62,7 @@ struct td_image_handle {
        } stats;
 };
 
-td_image_t *tapdisk_image_allocate(const char *, int, td_flag_t, void *);
+td_image_t *tapdisk_image_allocate(const char *, int, td_flag_t);
 void tapdisk_image_free(td_image_t *);
 
 int tapdisk_image_check_td_request(td_image_t *, td_request_t);

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index 2558e5ced13139198103ce967bd2e3c5c28d51f9..1306e335a2ff845b698512ebf4f49525834cc0c2 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -229,8 +229,7 @@ tapdisk_vbd_add_block_cache(td_vbd_t *vbd)
 
        cache = tapdisk_image_allocate(target->name,
                                       DISK_TYPE_BLOCK_CACHE,
-                                      target->flags,
-                                      target->private);
+                                      target->flags);
        if (!cache)
                return -ENOMEM;
 
@@ -285,9 +284,8 @@ tapdisk_vbd_add_local_cache(td_vbd_t *vbd)
        }
 
        cache = tapdisk_image_allocate(parent->name,
-                       DISK_TYPE_LOCAL_CACHE,
-                       parent->flags,
-                       parent->private);
+                                      DISK_TYPE_LOCAL_CACHE,
+                                      parent->flags);
 
        if (!cache)
                return -ENOMEM;
@@ -337,8 +335,7 @@ tapdisk_vbd_add_secondary(td_vbd_t *vbd)
        leaf = tapdisk_vbd_first_image(vbd);
        second = tapdisk_image_allocate(vbd->secondary_name,
                                        vbd->secondary_type,
-                                       leaf->flags,
-                                       leaf->private);
+                                       leaf->flags);
 
        if (!second)
                return -ENOMEM;
@@ -430,7 +427,7 @@ tapdisk_vbd_open_index(td_vbd_t *vbd)
        }
 
        flags = vbd->flags | TD_OPEN_RDONLY | TD_OPEN_SHAREABLE;
-       image = tapdisk_image_allocate(path, DISK_TYPE_VINDEX, flags, vbd);
+       image = tapdisk_image_allocate(path, DISK_TYPE_VINDEX, flags);
        if (!image) {
                err = -ENOMEM;
                goto fail;
@@ -464,8 +461,7 @@ tapdisk_vbd_add_dirty_log(td_vbd_t *vbd)
 
        log    = tapdisk_image_allocate(parent->name,
                                        DISK_TYPE_LOG,
-                                       parent->flags,
-                                       vbd);
+                                       parent->flags);
        if (!log)
                return -ENOMEM;
 
@@ -508,7 +504,7 @@ __tapdisk_vbd_open_vdi(td_vbd_t *vbd, td_flag_t extra_flags)
 
        for (;;) {
                err   = -ENOMEM;
-               image = tapdisk_image_allocate(file, type, flags, vbd);
+               image = tapdisk_image_allocate(file, type, flags);
 
                if (file != vbd->name) {
                        free(file);
@@ -1399,8 +1395,8 @@ tapdisk_vbd_forward_request(td_request_t treq)
        td_vbd_request_t *vreq;
 
        image = treq.image;
-       vbd   = (td_vbd_t *)image->private;
-       vreq  = (td_vbd_request_t *)treq.private;
+       vreq  = treq.private;
+       vbd   = vreq->vbd;
 
        tapdisk_vbd_mark_progress(vbd);
 
@@ -1418,8 +1414,8 @@ tapdisk_vbd_complete_td_request(td_request_t treq, int res)
        td_vbd_request_t *vreq;
 
        image = treq.image;
-       vbd   = (td_vbd_t *)image->private;
-       vreq  = (td_vbd_request_t *)treq.private;
+       vreq  = treq.private;
+       vbd   = vreq->vbd;
 
        tapdisk_vbd_mark_progress(vbd);