aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2022-09-23 16:28:38 +0200
committerKevin Wolf <kwolf@redhat.com>2022-10-07 12:11:41 +0200
commita7ca2eb488ff149c898f43abe103f8bd8e3ca3c4 (patch)
tree4e3c4a5e4b292f5d0b2f2817e8e7d292801d56e3 /block
parent9bd4d3c2e3d2e1df979e818ff0a5c05ca455721a (diff)
downloadqemu-a7ca2eb488ff149c898f43abe103f8bd8e3ca3c4.zip
qemu-a7ca2eb488ff149c898f43abe103f8bd8e3ca3c4.tar.gz
qemu-a7ca2eb488ff149c898f43abe103f8bd8e3ca3c4.tar.bz2
file-posix: Remove unused s->discard_zeroes
The field is unused (only ever set, but never read) since commit ac9185603. Additionally, the commit message of commit 34fa110e already explained earlier why it's unreliable. Remove it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20220923142838.91043-1-kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/file-posix.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/block/file-posix.c b/block/file-posix.c
index ad30219..23acffb 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -154,7 +154,6 @@ typedef struct BDRVRawState {
bool has_discard:1;
bool has_write_zeroes:1;
- bool discard_zeroes:1;
bool use_linux_aio:1;
bool use_linux_io_uring:1;
int page_cache_inconsistent; /* errno from fdatasync failure */
@@ -755,7 +754,6 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
ret = -EINVAL;
goto fail;
} else {
- s->discard_zeroes = true;
s->has_fallocate = true;
}
} else {
@@ -769,19 +767,12 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
}
if (S_ISBLK(st.st_mode)) {
-#ifdef BLKDISCARDZEROES
- unsigned int arg;
- if (ioctl(s->fd, BLKDISCARDZEROES, &arg) == 0 && arg) {
- s->discard_zeroes = true;
- }
-#endif
#ifdef __linux__
/* On Linux 3.10, BLKDISCARD leaves stale data in the page cache. Do
* not rely on the contents of discarded blocks unless using O_DIRECT.
* Same for BLKZEROOUT.
*/
if (!(bs->open_flags & BDRV_O_NOCACHE)) {
- s->discard_zeroes = false;
s->has_write_zeroes = false;
}
#endif