update submodule and patches to 6.1.1

[pve-qemu.git] / debian / patches / bitmap-mirror / 0002-drive-mirror-add-support-for-conditional-and-always-.patch

diff --git a/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch b/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
index ceeb7a3e49443c69a9e1d3935d1f8726ae8e4b00..5dd016571558995e16b9cede9c42311f5f6c810c 100644 (file)
--- a/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
+++ b/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
@@ -18,15 +18,16 @@ incremental backup modes; we can use this bitmap to later refresh a
 successfully created mirror.
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  block/mirror.c | 24 ++++++++++++++++++------
  1 file changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/block/mirror.c b/block/mirror.c
-index 9d73875bd6..8148df1f80 100644
+index 0821214138..c688726fae 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -667,8 +667,6 @@ static int mirror_exit_common(Job *job)
+@@ -674,8 +674,6 @@ static int mirror_exit_common(Job *job)
          bdrv_unfreeze_backing_chain(mirror_top_bs, target_bs);
      }
  
@@ -35,7 +36,7 @@ index 9d73875bd6..8148df1f80 100644
      /* Make sure that the source BDS doesn't go away during bdrv_replace_node,
       * before we can call bdrv_drained_end */
      bdrv_ref(src);
-@@ -776,6 +774,18 @@ static int mirror_exit_common(Job *job)
+@@ -783,6 +781,18 @@ static int mirror_exit_common(Job *job)
      blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort);
      blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort);
  
@@ -54,7 +55,7 @@ index 9d73875bd6..8148df1f80 100644
      bs_opaque->job = NULL;
  
      bdrv_drained_end(src);
-@@ -1628,10 +1638,6 @@ static BlockJob *mirror_start_job(
+@@ -1635,10 +1645,6 @@ static BlockJob *mirror_start_job(
                         " sync mode",
                         MirrorSyncMode_str(sync_mode));
              return NULL;
@@ -65,7 +66,7 @@ index 9d73875bd6..8148df1f80 100644
          }
      } else if (bitmap) {
          error_setg(errp,
-@@ -1648,6 +1654,12 @@ static BlockJob *mirror_start_job(
+@@ -1655,6 +1661,12 @@ static BlockJob *mirror_start_job(
              return NULL;
          }
          granularity = bdrv_dirty_bitmap_granularity(bitmap);