debian/patches/pve/0021-backup-do-not-use-bdrv_drain_all.patch

   1 From 4de872af5f176bbcc0d2f19b9fd30a7cefbddd9a Mon Sep 17 00:00:00 2001
   2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
   3 Date: Wed, 9 Dec 2015 15:41:13 +0100
   4 Subject: [PATCH 21/47] backup: do not use bdrv_drain_all
   5
   6 ---
   7  blockdev.c | 6 +-----
   8  1 file changed, 1 insertion(+), 5 deletions(-)
   9
  10 diff --git a/blockdev.c b/blockdev.c
  11 index a9a900e..36b4083 100644
  12 --- a/blockdev.c
  13 +++ b/blockdev.c
  14 @@ -3135,9 +3135,6 @@ static void pvebackup_cancel(void *opaque)
  15          vma_writer_set_error(backup_state.vmaw, "backup cancelled");
  16      }
  17
  18 -    /* drain all i/o (awake jobs waiting for aio) */
  19 -    bdrv_drain_all();
  20 -
  21      GList *l = backup_state.di_list;
  22      while (l) {
  23          PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
  24 @@ -3146,8 +3143,7 @@ static void pvebackup_cancel(void *opaque)
  25              BlockJob *job = di->bs->job;
  26              if (job) {
  27                  if (!di->completed) {
  28 -                     block_job_cancel_sync(job);
  29 -                     bdrv_drain_all(); /* drain all i/o (awake jobs waiting for aio) */
  30 +                    block_job_cancel_sync(job);
  31                  }
  32              }
  33          }
  34 --
  35 2.1.4
  36