[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 5/8] block: Evaluate @exact in protocol drivers
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH 5/8] block: Evaluate @exact in protocol drivers |
Date: |
Wed, 18 Sep 2019 11:51:41 +0200 |
We have two protocol drivers that return success when trying to shrink a
block device even though they cannot shrink it. This behavior is now
only allowed with exact=false, so they should return an error with
exact=true.
Signed-off-by: Max Reitz <address@hidden>
---
block/file-posix.c | 8 +++++++-
block/iscsi.c | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index d8755c5fac..a85f3486d1 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2028,6 +2028,7 @@ static int coroutine_fn raw_co_truncate(BlockDriverState
*bs, int64_t offset,
}
if (S_ISREG(st.st_mode)) {
+ /* Always resizes to the exact @offset */
return raw_regular_truncate(bs, s->fd, offset, prealloc, errp);
}
@@ -2038,7 +2039,12 @@ static int coroutine_fn raw_co_truncate(BlockDriverState
*bs, int64_t offset,
}
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
- if (offset > raw_getlength(bs)) {
+ int64_t cur_length = raw_getlength(bs);
+
+ if (offset != cur_length && exact) {
+ error_setg(errp, "Cannot resize device files");
+ return -ENOTSUP;
+ } else if (offset > cur_length) {
error_setg(errp, "Cannot grow device files");
return -EINVAL;
}
diff --git a/block/iscsi.c b/block/iscsi.c
index a90426270a..cc2072ff6c 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -2126,6 +2126,7 @@ static int coroutine_fn
iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
Error **errp)
{
IscsiLun *iscsilun = bs->opaque;
+ int64_t cur_length;
Error *local_err = NULL;
if (prealloc != PREALLOC_MODE_OFF) {
@@ -2145,7 +2146,11 @@ static int coroutine_fn
iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
return -EIO;
}
- if (offset > iscsi_getlength(bs)) {
+ cur_length = iscsi_getlength(bs);
+ if (offset != cur_length && exact) {
+ error_setg(errp, "Cannot resize iSCSI devices");
+ return -ENOTSUP;
+ } else if (offset > cur_length) {
error_setg(errp, "Cannot grow iSCSI devices");
return -EINVAL;
}
--
2.21.0
- [Qemu-block] [PATCH 0/8] block: Add @exact parameter to bdrv_co_truncate(), Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 1/8] block: Handle filter truncation like native impl., Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 2/8] block/cor: Drop cor_co_truncate(), Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 3/8] block: Do not truncate file node when formatting, Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 5/8] block: Evaluate @exact in protocol drivers,
Max Reitz <=
- [Qemu-block] [PATCH 4/8] block: Add @exact parameter to bdrv_co_truncate(), Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 6/8] block: Let format drivers pass @exact, Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 7/8] block: Pass truncate exact=true where reasonable, Max Reitz, 2019/09/18
- [Qemu-block] [PATCH 8/8] Revert "qemu-img: Check post-truncation size", Max Reitz, 2019/09/18