mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file-posix: Remove unused s->discard_zeroes

Browse Source 
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>
This commit is contained in:
Kevin Wolf 2022-09-23 16:28:38 +02:00
parent 9bd4d3c2e3
commit a7ca2eb488
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/file-posix.c
View File

@ -154,7 +154,6 @@ typedef struct BDRVRawState {
bool has_discard:1; bool has_discard:1;
bool has_write_zeroes:1; bool has_write_zeroes:1;
bool discard_zeroes:1;
bool use_linux_aio:1; bool use_linux_aio:1;
bool use_linux_io_uring:1; bool use_linux_io_uring:1;
int page_cache_inconsistent; /* errno from fdatasync failure */ int page_cache_inconsistent; /* errno from fdatasync failure */
@ -755,7 +754,6 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} else { } else {
s->discard_zeroes = true;
s->has_fallocate = true; s->has_fallocate = true;
} }
} else { } else {
@ -769,19 +767,12 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
} }
if (S_ISBLK(st.st_mode)) { 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__ #ifdef __linux__
/* On Linux 3.10, BLKDISCARD leaves stale data in the page cache. Do /* 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. * not rely on the contents of discarded blocks unless using O_DIRECT.
* Same for BLKZEROOUT. * Same for BLKZEROOUT.
*/ */
if (!(bs->open_flags & BDRV_O_NOCACHE)) { if (!(bs->open_flags & BDRV_O_NOCACHE)) {
s->discard_zeroes = false;
s->has_write_zeroes = false; s->has_write_zeroes = false;
} }
#endif #endif