update to qemu-2.9.0-rc2

[pve-qemu-kvm.git] / debian / patches / pve / 0047-glusterfs-allow-partial-reads.patch

diff --git a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch
index 6e2379a2716d22db78e72509ccb13ffb79dd3b52..4603bf9f4b15acd9a2ec613a395562bc1257c93d 100644 (file)
--- a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch
+++ b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch
@@ -1,4 +1,4 @@
-From 519bcfc6d86a42a643ee65a0741bb2418c7d2e67 Mon Sep 17 00:00:00 2001
+From 78c0d9821117e00137f67ed8e0503094771817cd Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 30 Nov 2016 10:27:47 +0100
 Subject: [PATCH 47/47] glusterfs: allow partial reads
@@ -14,18 +14,18 @@ sense.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/block/gluster.c b/block/gluster.c
-index 6dcf926..17c51ed 100644
+index e712dc7..daf6cec 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
-@@ -39,6 +39,7 @@ typedef struct GlusterAIOCB {
-     QEMUBH *bh;
+@@ -42,6 +42,7 @@ typedef struct GlusterAIOCB {
+     int ret;
      Coroutine *coroutine;
      AioContext *aio_context;
 +    bool is_write;
  } GlusterAIOCB;
  
  typedef struct BDRVGlusterState {
-@@ -623,8 +624,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg)
+@@ -705,8 +706,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg)
          acb->ret = 0; /* Success */
      } else if (ret < 0) {
          acb->ret = -errno; /* Read/Write failed */
@@ -36,8 +36,8 @@ index 6dcf926..17c51ed 100644
 +        acb->ret = 0; /* Success */
      }
  
-     acb->bh = aio_bh_new(acb->aio_context, qemu_gluster_complete_aio, acb);
-@@ -861,6 +864,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
+     aio_co_schedule(acb->aio_context, acb->coroutine);
+@@ -954,6 +957,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
      acb.ret = 0;
      acb.coroutine = qemu_coroutine_self();
      acb.aio_context = bdrv_get_aio_context(bs);
@@ -45,7 +45,7 @@ index 6dcf926..17c51ed 100644
  
      ret = glfs_zerofill_async(s->fd, offset, size, gluster_finish_aiocb, &acb);
      if (ret < 0) {
-@@ -979,9 +983,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
+@@ -1076,9 +1080,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
      acb.aio_context = bdrv_get_aio_context(bs);
  
      if (write) {
@@ -57,7 +57,7 @@ index 6dcf926..17c51ed 100644
          ret = glfs_preadv_async(s->fd, qiov->iov, qiov->niov, offset, 0,
                                  gluster_finish_aiocb, &acb);
      }
-@@ -1044,6 +1050,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
+@@ -1142,6 +1148,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
      acb.ret = 0;
      acb.coroutine = qemu_coroutine_self();
      acb.aio_context = bdrv_get_aio_context(bs);
@@ -65,7 +65,7 @@ index 6dcf926..17c51ed 100644
  
      ret = glfs_fsync_async(s->fd, gluster_finish_aiocb, &acb);
      if (ret < 0) {
-@@ -1090,6 +1097,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
+@@ -1188,6 +1195,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
      acb.ret = 0;
      acb.coroutine = qemu_coroutine_self();
      acb.aio_context = bdrv_get_aio_context(bs);