Make treq.vreq explicit.

Used to be vreq.private, but only has a single user. Note that
completion callbacks rather use vreq->token to attach issuer state.

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

diff --git a/drivers/block-lcache.c b/drivers/block-lcache.c
index 2dc46567c382a9d578f50470795a3f11facff296..8894eb47d626d9d082e2cfc387fce77fbbc29760 100644 (file)
--- a/drivers/block-lcache.c
+++ b/drivers/block-lcache.c
@@ -160,7 +160,7 @@ local_cache_complete_read(local_cache_t *cache, local_cache_request_t *lreq)
        td_vbd_t *vbd;
        td_request_t clone;
 
-       vreq = lreq->treq.private;
+       vreq = lreq->treq.vreq;
        vbd  = vreq->vbd;
 
        if (!lreq->err) {

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index 03bbcb3b7c4d906ae1afb54098961d9d1372dac5..ae66b63fcef2bda0304720ccff8165a13bd13425 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -972,7 +972,7 @@ __tapdisk_vbd_reissue_td_request(td_vbd_t *vbd,
        td_image_t *parent;
        td_vbd_request_t *vreq;
 
-       vreq = (td_vbd_request_t *)treq.private;
+       vreq = treq.vreq;
        gettimeofday(&vreq->last_try, NULL);
 
        vreq->submitting++;
@@ -1030,7 +1030,7 @@ tapdisk_vbd_forward_request(td_request_t treq)
        td_vbd_request_t *vreq;
 
        image = treq.image;
-       vreq  = treq.private;
+       vreq  = treq.vreq;
        vbd   = vreq->vbd;
 
        tapdisk_vbd_mark_progress(vbd);
@@ -1049,7 +1049,7 @@ tapdisk_vbd_complete_td_request(td_request_t treq, int res)
        td_vbd_request_t *vreq;
 
        image = treq.image;
-       vreq  = treq.private;
+       vreq  = treq.vreq;
        vbd   = vreq->vbd;
 
        tapdisk_vbd_mark_progress(vbd);
@@ -1129,7 +1129,7 @@ tapdisk_vbd_issue_request(td_vbd_t *vbd, td_vbd_request_t *vreq)
                treq.image          = image;
                treq.cb             = tapdisk_vbd_complete_td_request;
                treq.cb_data        = NULL;
-               treq.private        = vreq;
+               treq.vreq           = vreq;
 
 
                vreq->secs_pending += iov->secs;

diff --git a/drivers/tapdisk.h b/drivers/tapdisk.h
index 1fc4d88574a8390b348aea65dc83627224a4cd19..c40d9b5c964dfb0490c302c9ff1d435bc890db83 100644 (file)
--- a/drivers/tapdisk.h
+++ b/drivers/tapdisk.h
@@ -166,8 +166,7 @@ struct td_request {
        void                        *cb_data;
 
        int                          sidx;
-       const td_vbd_request_t      *vreq;
-       void                        *private;
+       td_vbd_request_t            *vreq;
 };
 
 /*