diff mbox

[for-2.5] xen_disk: Remove ioreq.postsync

Message ID 1448445254-21420-1-git-send-email-berto@igalia.com
State New
Headers show

Commit Message

Alberto Garcia Nov. 25, 2015, 9:54 a.m. UTC
This code has been dead for three years (since commit 7e7b7cba1).

Signed-off-by: Alberto Garcia <berto@igalia.com>
---
 hw/block/xen_disk.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Stefano Stabellini Nov. 25, 2015, 11:04 a.m. UTC | #1
On Wed, 25 Nov 2015, Alberto Garcia wrote:
> This code has been dead for three years (since commit 7e7b7cba1).
> 
> Signed-off-by: Alberto Garcia <berto@igalia.com>

Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Kevin,

I'll send it out together with another fix today.



>  hw/block/xen_disk.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
> index 02eda6e..8146650 100644
> --- a/hw/block/xen_disk.c
> +++ b/hw/block/xen_disk.c
> @@ -75,7 +75,6 @@ struct ioreq {
>      off_t               start;
>      QEMUIOVector        v;
>      int                 presync;
> -    int                 postsync;
>      uint8_t             mapped;
>  
>      /* grant mapping */
> @@ -144,7 +143,6 @@ static void ioreq_reset(struct ioreq *ioreq)
>      ioreq->status = 0;
>      ioreq->start = 0;
>      ioreq->presync = 0;
> -    ioreq->postsync = 0;
>      ioreq->mapped = 0;
>  
>      memset(ioreq->domids, 0, sizeof(ioreq->domids));
> @@ -520,12 +518,6 @@ static void qemu_aio_complete(void *opaque, int ret)
>      if (ioreq->aio_inflight > 0) {
>          return;
>      }
> -    if (ioreq->postsync) {
> -        ioreq->postsync = 0;
> -        ioreq->aio_inflight++;
> -        blk_aio_flush(ioreq->blkdev->blk, qemu_aio_complete, ioreq);
> -        return;
> -    }
>  
>      ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;
>      ioreq_unmap(ioreq);
> -- 
> 2.6.2
>
diff mbox

Patch

diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index 02eda6e..8146650 100644
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -75,7 +75,6 @@  struct ioreq {
     off_t               start;
     QEMUIOVector        v;
     int                 presync;
-    int                 postsync;
     uint8_t             mapped;
 
     /* grant mapping */
@@ -144,7 +143,6 @@  static void ioreq_reset(struct ioreq *ioreq)
     ioreq->status = 0;
     ioreq->start = 0;
     ioreq->presync = 0;
-    ioreq->postsync = 0;
     ioreq->mapped = 0;
 
     memset(ioreq->domids, 0, sizeof(ioreq->domids));
@@ -520,12 +518,6 @@  static void qemu_aio_complete(void *opaque, int ret)
     if (ioreq->aio_inflight > 0) {
         return;
     }
-    if (ioreq->postsync) {
-        ioreq->postsync = 0;
-        ioreq->aio_inflight++;
-        blk_aio_flush(ioreq->blkdev->blk, qemu_aio_complete, ioreq);
-        return;
-    }
 
     ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;
     ioreq_unmap(ioreq);