|
 |
383d26 |
From c757f534ae34ad858e0d706e0fb893ef5f3aeb28 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Date: Mon, 18 Jun 2018 16:12:06 +0200
|
|
|
383d26 |
Subject: [PATCH 30/54] block: Add BDRV_REQ_WRITE_UNCHANGED flag
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Message-id: <20180618161212.14444-5-mreitz@redhat.com>
|
|
|
383d26 |
Patchwork-id: 80764
|
|
|
383d26 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 04/10] block: Add BDRV_REQ_WRITE_UNCHANGED flag
|
|
|
383d26 |
Bugzilla: 1518738
|
|
|
383d26 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
This flag signifies that a write request will not change the visible
|
|
|
383d26 |
disk content. With this flag set, it is sufficient to have the
|
|
|
383d26 |
BLK_PERM_WRITE_UNCHANGED permission instead of BLK_PERM_WRITE.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
383d26 |
Message-id: 20180421132929.21610-4-mreitz@redhat.com
|
|
|
383d26 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
(cherry picked from commit c6035964f8316b504060618d05b5dd434f18595b)
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
block/io.c | 6 +++++-
|
|
|
383d26 |
include/block/block.h | 6 +++++-
|
|
|
383d26 |
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/block/io.c b/block/io.c
|
|
|
383d26 |
index bd9a19a..134b2a4 100644
|
|
|
383d26 |
--- a/block/io.c
|
|
|
383d26 |
+++ b/block/io.c
|
|
|
383d26 |
@@ -1501,7 +1501,11 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,
|
|
|
383d26 |
assert(!waited || !req->serialising);
|
|
|
383d26 |
assert(req->overlap_offset <= offset);
|
|
|
383d26 |
assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);
|
|
|
383d26 |
- assert(child->perm & BLK_PERM_WRITE);
|
|
|
383d26 |
+ if (flags & BDRV_REQ_WRITE_UNCHANGED) {
|
|
|
383d26 |
+ assert(child->perm & (BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE));
|
|
|
383d26 |
+ } else {
|
|
|
383d26 |
+ assert(child->perm & BLK_PERM_WRITE);
|
|
|
383d26 |
+ }
|
|
|
383d26 |
assert(end_sector <= bs->total_sectors || child->perm & BLK_PERM_RESIZE);
|
|
|
383d26 |
|
|
|
383d26 |
ret = notifier_with_return_list_notify(&bs->before_write_notifiers, req);
|
|
|
383d26 |
diff --git a/include/block/block.h b/include/block/block.h
|
|
|
383d26 |
index 397b5e8..3894edd 100644
|
|
|
383d26 |
--- a/include/block/block.h
|
|
|
383d26 |
+++ b/include/block/block.h
|
|
|
383d26 |
@@ -54,8 +54,12 @@ typedef enum {
|
|
|
383d26 |
BDRV_REQ_FUA = 0x10,
|
|
|
383d26 |
BDRV_REQ_WRITE_COMPRESSED = 0x20,
|
|
|
383d26 |
|
|
|
383d26 |
+ /* Signifies that this write request will not change the visible disk
|
|
|
383d26 |
+ * content. */
|
|
|
383d26 |
+ BDRV_REQ_WRITE_UNCHANGED = 0x40,
|
|
|
383d26 |
+
|
|
|
383d26 |
/* Mask of valid flags */
|
|
|
383d26 |
- BDRV_REQ_MASK = 0x3f,
|
|
|
383d26 |
+ BDRV_REQ_MASK = 0x7f,
|
|
|
383d26 |
} BdrvRequestFlags;
|
|
|
383d26 |
|
|
|
383d26 |
typedef struct BlockSizes {
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|