update to 2.7

[pve-qemu-kvm.git] / debian / patches / pve / 0022-backup-do-not-use-bdrv_drain_all.patch

diff --git a/debian/patches/pve/0022-backup-do-not-use-bdrv_drain_all.patch b/debian/patches/pve/0022-backup-do-not-use-bdrv_drain_all.patch
deleted file mode 100644 (file)
index 7c84955..0000000
--- a/debian/patches/pve/0022-backup-do-not-use-bdrv_drain_all.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5848b90ad434c9c697e32cdd00a34708cfce24c5 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Wed, 9 Dec 2015 15:41:13 +0100
-Subject: [PATCH 22/55] backup: do not use bdrv_drain_all
-
----
- blockdev.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/blockdev.c b/blockdev.c
-index 2c51b95..0131e92 100644
---- a/blockdev.c
-+++ b/blockdev.c
-@@ -3142,9 +3142,6 @@ static void pvebackup_cancel(void *opaque)
-         vma_writer_set_error(backup_state.vmaw, "backup cancelled");
-     }
- 
--    /* drain all i/o (awake jobs waiting for aio) */
--    bdrv_drain_all();
--
-     GList *l = backup_state.di_list;
-     while (l) {
-         PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-@@ -3153,8 +3150,7 @@ static void pvebackup_cancel(void *opaque)
-             BlockJob *job = di->bs->job;
-             if (job) {
-                 if (!di->completed) {
--                     block_job_cancel_sync(job);
--                     bdrv_drain_all(); /* drain all i/o (awake jobs waiting for aio) */
-+                    block_job_cancel_sync(job);
-                 }
-             }
-         }
--- 
-2.1.4
-