PR-1053: Eliminate the vreq->status.

Used to be a blkif-style status code. Obsolete, since tapdisk-blktap
only deals with vreq->error codes anyway.

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

diff --git a/drivers/tapdisk-image.h b/drivers/tapdisk-image.h
index 1be18ca783db1ca6628ec517fefd698f7ffdb125..a6c0c078216973335089ab18dec6066bbf3de7f2 100644 (file)
--- a/drivers/tapdisk-image.h
+++ b/drivers/tapdisk-image.h
@@ -29,7 +29,6 @@
 #define _TAPDISK_IMAGE_H_
 
 #include "tapdisk.h"
-#include "blktap.h"
 
 struct td_image_handle {
        int                          type;

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index a8b9bfc1fb06958b6ca53b1ad72381e42cf79962..1ec1a17b7f2a219b436dfe9be858038b8db60f5e 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -912,7 +912,7 @@ static void
 tapdisk_vbd_complete_vbd_request(td_vbd_t *vbd, td_vbd_request_t *vreq)
 {
        if (!vreq->submitting && !vreq->secs_pending) {
-               if (vreq->status == BLKTAP_RSP_ERROR &&
+               if (vreq->error &&
                    tapdisk_vbd_request_should_retry(vbd, vreq))
                        tapdisk_vbd_move_request(vreq, &vbd->failed_requests);
                else
@@ -952,8 +952,7 @@ __tapdisk_vbd_complete_td_request(td_vbd_t *vbd, td_vbd_request_t *vreq,
        }
 
        if (err) {
-               vreq->status = BLKTAP_RSP_ERROR;
-               vreq->error  = (vreq->error ? : err);
+               vreq->error = (vreq->error ? : err);
                if (err != -EBUSY) {
                        vbd->errors++;
                        ERR(err, "req %s: %s 0x%04x secs @ 0x%08"PRIx64,
@@ -1179,7 +1178,7 @@ out:
        return err;
 
 fail:
-       vreq->status = BLKTAP_RSP_ERROR;
+       vreq->error = err;
        goto out;
 }
 
@@ -1215,7 +1214,6 @@ tapdisk_vbd_reissue_failed_requests(td_vbd_t *vbd)
                vbd->retries++;
                vreq->num_retries++;
                vreq->error  = 0;
-               vreq->status = BLKTAP_RSP_OKAY;
                DBG(TLOG_DBG, "retry #%d of req %s, "
                    "sec 0x%08"PRIx64", iovcnt: %d\n", vreq->num_retries,
                    vreq->name, vreq->sec, vreq->iovcnt);
@@ -1271,12 +1269,12 @@ tapdisk_vbd_kill_requests(td_vbd_t *vbd)
        td_vbd_request_t *vreq, *tmp;
 
        tapdisk_vbd_for_each_request(vreq, tmp, &vbd->new_requests) {
-               vreq->status = BLKTAP_RSP_ERROR;
+               vreq->error = -ESHUTDOWN;
                tapdisk_vbd_move_request(vreq, &vbd->completed_requests);
        }
 
        tapdisk_vbd_for_each_request(vreq, tmp, &vbd->failed_requests) {
-               vreq->status = BLKTAP_RSP_ERROR;
+               vreq->error = -ESHUTDOWN;
                tapdisk_vbd_move_request(vreq, &vbd->completed_requests);
        }
 

diff --git a/drivers/tapdisk-vbd.h b/drivers/tapdisk-vbd.h
index 8ef9ba4df4794c7adbbbe1fb27ca9fd3478dead1..3fc1ff039d42ff0f3daecb5daecb4cf0bad6d306 100644 (file)
--- a/drivers/tapdisk-vbd.h
+++ b/drivers/tapdisk-vbd.h
@@ -31,7 +31,6 @@
 #include <sys/time.h>
 
 #include "tapdisk.h"
-#include "blktap.h"
 #include "scheduler.h"
 #include "tapdisk-image.h"
 #include "tapdisk-blktap.h"

diff --git a/drivers/tapdisk.h b/drivers/tapdisk.h
index dd91e0297c785c37d3e6201a30816dbce1ea934a..1fc4d88574a8390b348aea65dc83627224a4cd19 100644 (file)
--- a/drivers/tapdisk.h
+++ b/drivers/tapdisk.h
@@ -141,7 +141,6 @@ struct td_vbd_request {
        void                       *token;
        const char                 *name;
 
-       int                         status;
        int                         error;
        int                         submitting;
        int                         secs_pending;