CA-27472: Revert 375:8a93ed55587e (CA-25683 - Don't bump the retry counter..)

diff --git a/drivers/block-vhd.c b/drivers/block-vhd.c
index 1abf34e478d93cbfae5a6f3d31c359039848e534..77eb5758d1c06ccfaedca6a1f20f98c0bb1ad183 100644 (file)
--- a/drivers/block-vhd.c
+++ b/drivers/block-vhd.c
@@ -1829,7 +1829,6 @@ vhd_queue_write(td_driver_t *driver, td_request_t treq)
 
                case VHD_BM_BAT_LOCKED:
                        err = -EBUSY;
-                       clone.blocked = 1;
                        goto fail;
 
                case VHD_BM_BAT_CLEAR:

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index 9a023c8c9c3b557920755d7fa4d695fd199113c5..248658a9d74239e8fe0e584abac13b7e8d3a2458 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -1324,8 +1324,6 @@ __tapdisk_vbd_complete_td_request(td_vbd_t *vbd, td_vbd_request_t *vreq,
        vbd->secs_pending  -= treq.secs;
        vreq->secs_pending -= treq.secs;
 
-       vreq->blocked = treq.blocked;
-
        if (err) {
                vreq->status = BLKIF_RSP_ERROR;
                vreq->error  = (vreq->error ? : err);
@@ -1508,7 +1506,6 @@ tapdisk_vbd_issue_request(td_vbd_t *vbd, td_vbd_request_t *vreq)
                if (!treq_started) {
                        treq.id      = id;
                        treq.sidx    = i;
-                       treq.blocked = 0;
                        treq.buf     = page;
                        treq.sec     = sector_nr;
                        treq.secs    = nsects;
@@ -1579,16 +1576,8 @@ tapdisk_vbd_reissue_failed_requests(td_vbd_t *vbd)
                        continue;
                }
 
-               /*
-                * never fail due to too many retries if we are blocked on a 
-                * dependency
-                */
-               if (vreq->blocked) {
-                       vreq->blocked = 0;
-               } else {
-                       vbd->retries++;
-                       vreq->num_retries++;
-               }
+               vbd->retries++;
+               vreq->num_retries++;
                vreq->error  = 0;
                vreq->status = BLKIF_RSP_OKAY;
                DBG(TLOG_DBG, "retry #%d of req %"PRIu64", "

diff --git a/drivers/tapdisk-vbd.h b/drivers/tapdisk-vbd.h
index 28ba1ac2b347c87ff1656b05fe1f063af69c5632..14da37a3effdb52c7eafc665f406b49f7b9ea59f 100644 (file)
--- a/drivers/tapdisk-vbd.h
+++ b/drivers/tapdisk-vbd.h
@@ -70,7 +70,6 @@ struct td_vbd_request {
        int16_t                     status;
 
        int                         error;
-       int                         blocked; /* blocked on a dependency */
        int                         submitting;
        int                         secs_pending;
        int                         num_retries;

diff --git a/drivers/tapdisk.h b/drivers/tapdisk.h
index 487c50fbf6d6b634e3761592ff1ab6dfa2fc1965..08f070055e4f8889e8de22919c72632fe42f3985 100644 (file)
--- a/drivers/tapdisk.h
+++ b/drivers/tapdisk.h
@@ -126,8 +126,6 @@ struct td_request {
        td_sector_t                  sec;
        int                          secs;
 
-       uint8_t                      blocked; /* blocked on a dependency */
-
        td_image_t                  *image;
 
        td_callback_t                cb;