[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/15] raw-posix: remember whether discard failed
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 04/15] raw-posix: remember whether discard failed |
Date: |
Tue, 15 Jan 2013 17:48:20 +0100 |
From: Paolo Bonzini <address@hidden>
Avoid sending system calls repeatedly if they shall fail. This
does not apply to XFS: if the filesystem-specific ioctl fails,
something weird is happening.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/raw-posix.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index e8d79af..b647cfb 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -141,6 +141,7 @@ typedef struct BDRVRawState {
#ifdef CONFIG_XFS
bool is_xfs : 1;
#endif
+ bool has_discard : 1;
} BDRVRawState;
typedef struct BDRVRawReopenState {
@@ -292,6 +293,7 @@ static int raw_open_common(BlockDriverState *bs, const char
*filename,
}
#endif
+ s->has_discard = 1;
#ifdef CONFIG_XFS
if (platform_test_xfs_fd(s->fd)) {
s->is_xfs = 1;
@@ -1078,10 +1080,12 @@ static coroutine_fn int raw_co_discard(BlockDriverState
*bs,
int64_t sector_num, int nb_sectors)
{
int ret = -EOPNOTSUPP;
-
-#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) || defined(CONFIG_XFS)
BDRVRawState *s = bs->opaque;
+ if (!s->has_discard) {
+ return 0;
+ }
+
#ifdef CONFIG_XFS
if (s->is_xfs) {
return xfs_discard(s, sector_num, nb_sectors);
@@ -1099,7 +1103,6 @@ static coroutine_fn int raw_co_discard(BlockDriverState
*bs,
ret = -errno;
#endif
-#endif
if (ret == -EOPNOTSUPP) {
return 0;
--
1.8.0.2
- [Qemu-devel] [PULL 00/15] Block patches for QEMU 1.4, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 01/15] qcow2: Fix segfault on zero-length write, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 05/15] raw: support discard on block devices, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 02/15] block: fix initialization in bdrv_io_limits_enable(), Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 04/15] raw-posix: remember whether discard failed,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/15] raw-posix: support discard on more filesystems, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 06/15] block: make discard asynchronous, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 07/15] ide: fix TRIM with empty range entry, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 08/15] ide: issue discard asynchronously but serialize the pieces, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 09/15] block: clear dirty bitmap when discarding, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 12/15] w32: Make qemu_vfree() accept NULL like the POSIX implementation, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 11/15] sheepdog: clean up sd_aio_setup(), Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 13/15] scsi-disk: qemu_vfree(NULL) is fine, simplify, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 14/15] win32-aio: Fix how win32_aio_process_completion() frees buffer, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 15/15] block: Fix how mirror_run() frees its buffer, Stefan Hajnoczi, 2013/01/15