[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/19] block: handle ENOTSUP from discard in gene
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 05/19] block: handle ENOTSUP from discard in generic code |
Date: |
Fri, 22 Nov 2013 13:39:47 +0100 |
Similar to write_zeroes, let the generic code receive a ENOTSUP for
discard operations. Since bdrv_discard has advisory semantics,
we can just swallow the error.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 2 +-
block/raw-posix.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index f9674d9..b18ee6b 100644
--- a/block.c
+++ b/block.c
@@ -4364,7 +4364,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs,
int64_t sector_num,
ret = co.ret;
}
}
- if (ret) {
+ if (ret && ret != -ENOTSUP) {
return ret;
}
diff --git a/block/raw-posix.c b/block/raw-posix.c
index f836c8e..cfa3162 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -323,10 +323,10 @@ static int raw_open_common(BlockDriverState *bs, QDict
*options,
}
#endif
- s->has_discard = 1;
+ s->has_discard = true;
#ifdef CONFIG_XFS
if (platform_test_xfs_fd(s->fd)) {
- s->is_xfs = 1;
+ s->is_xfs = true;
}
#endif
@@ -698,8 +698,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb)
int ret = -EOPNOTSUPP;
BDRVRawState *s = aiocb->bs->opaque;
- if (s->has_discard == 0) {
- return 0;
+ if (!s->has_discard) {
+ return -ENOTSUP;
}
if (aiocb->aio_type & QEMU_AIO_BLKDEV) {
@@ -734,8 +734,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb)
if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP ||
ret == -ENOTTY) {
- s->has_discard = 0;
- ret = 0;
+ s->has_discard = false;
+ ret = -ENOTSUP;
}
return ret;
}
--
1.8.4.2
- [Qemu-devel] [PATCH v3 00/19] block & scsi: write_zeroes support through the whole stack, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 01/19] block: generalize BlockLimits handling to cover bdrv_aio_discard too, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 02/19] block: add flags to BlockRequest, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 03/19] block: add flags argument to bdrv_co_write_zeroes tracepoint, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 04/19] block: add bdrv_aio_write_zeroes, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 05/19] block: handle ENOTSUP from discard in generic code,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 07/19] vpc, vhdx: add get_info, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 09/19] block drivers: expose requirement for write same alignment from formats, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 08/19] block drivers: add discard/write_zeroes properties to bdrv_get_info implementation, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 10/19] block/iscsi: remove .bdrv_has_zero_init, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 06/19] block: make bdrv_co_do_write_zeroes stricter in producing aligned requests, Paolo Bonzini, 2013/11/22