david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: handle ENOTSUP from discard in generic code

Browse Source 
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 <pbonzini@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-11-22 13:39:47 +01:00 committed by Stefan Hajnoczi
parent d5ef94d43d
commit 7ce21016b6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block.c
View File

@ -4376,7 +4376,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
ret = co.ret; ret = co.ret;
} }
} }
if (ret) { if (ret && ret != -ENOTSUP) {
return ret; return ret;
} }

12
block/raw-posix.c
View File

@ -323,10 +323,10 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
} }
#endif #endif
s->has_discard = 1; s->has_discard = true;
#ifdef CONFIG_XFS #ifdef CONFIG_XFS
if (platform_test_xfs_fd(s->fd)) { if (platform_test_xfs_fd(s->fd)) {
s->is_xfs = 1; s->is_xfs = true;
} }
#endif #endif
@ -698,8 +698,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb)
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
BDRVRawState *s = aiocb->bs->opaque; BDRVRawState *s = aiocb->bs->opaque;
if (s->has_discard == 0) { if (!s->has_discard) {
return 0; return -ENOTSUP;
} }
if (aiocb->aio_type & QEMU_AIO_BLKDEV) { 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 || if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP ||
ret == -ENOTTY) { ret == -ENOTTY) {
s->has_discard = 0; s->has_discard = false;
ret = 0; ret = -ENOTSUP;
} }
return ret; return ret;
} }