diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-08-16 11:48:17 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-09-10 08:58:43 +0200 |
| commit | effecce6bcb830a661c882d7299b53382b56a131 (patch) | |
| tree | 2b529eae7620e38cd000c73718102e495f3363f3 | |
| parent | 6b9d62c2a9e83bbad73fb61406f0ff69b46ff6f3 (diff) | |
| download | focaccia-qemu-effecce6bcb830a661c882d7299b53382b56a131.tar.gz focaccia-qemu-effecce6bcb830a661c882d7299b53382b56a131.zip | |
file-posix: Fix has_write_zeroes after NO_FALLBACK
If QEMU_AIO_NO_FALLBACK is given, we always return failure and don't even try to use the BLKZEROOUT ioctl. In this failure case, we shouldn't disable has_write_zeroes because we didn't learn anything about the ioctl. The next request might not set QEMU_AIO_NO_FALLBACK and we can still use the ioctl then. Fixes: 738301e1175 Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | block/file-posix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index f683a36c8a..f12c06de2d 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1502,12 +1502,12 @@ static ssize_t handle_aiocb_write_zeroes_block(RawPosixAIOData *aiocb) } while (errno == EINTR); ret = translate_err(-errno); + if (ret == -ENOTSUP) { + s->has_write_zeroes = false; + } } #endif - if (ret == -ENOTSUP) { - s->has_write_zeroes = false; - } return ret; } |