diff options
| author | Hanna Czenczek <hreitz@redhat.com> | 2023-08-24 17:53:43 +0200 |
|---|---|---|
| committer | Hanna Czenczek <hreitz@redhat.com> | 2023-08-29 10:51:04 +0200 |
| commit | d31b50a15dd25a560749b25fc40b6484fd1a57b7 (patch) | |
| tree | 141ec33bf9b0227de022de183873f2ba1bff709e | |
| parent | deab5c9a4ed74f76a713008a42527762b30a7e84 (diff) | |
| download | focaccia-qemu-d31b50a15dd25a560749b25fc40b6484fd1a57b7.tar.gz focaccia-qemu-d31b50a15dd25a560749b25fc40b6484fd1a57b7.zip | |
file-posix: Simplify raw_co_prw's 'out' zone code
We duplicate the same condition three times here, pull it out to the top level. Signed-off-by: Hanna Czenczek <hreitz@redhat.com> Message-Id: <20230824155345.109765-5-hreitz@redhat.com> Reviewed-by: Sam Li <faithilikerun@gmail.com>
| -rw-r--r-- | block/file-posix.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index a050682e97..aa89789737 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2506,11 +2506,10 @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset, out: #if defined(CONFIG_BLKZONED) -{ - BlockZoneWps *wps = bs->wps; - if (ret == 0) { - if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && - bs->bl.zoned != BLK_Z_NONE) { + if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && + bs->bl.zoned != BLK_Z_NONE) { + BlockZoneWps *wps = bs->wps; + if (ret == 0) { uint64_t *wp = &wps->wp[offset / bs->bl.zone_size]; if (!BDRV_ZT_IS_CONV(*wp)) { if (type & QEMU_AIO_ZONE_APPEND) { @@ -2523,19 +2522,12 @@ out: *wp = offset + bytes; } } - } - } else { - if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && - bs->bl.zoned != BLK_Z_NONE) { + } else { update_zones_wp(bs, s->fd, 0, 1); } - } - if ((type & (QEMU_AIO_WRITE | QEMU_AIO_ZONE_APPEND)) && - bs->blk.zoned != BLK_Z_NONE) { qemu_co_mutex_unlock(&wps->colock); } -} #endif return ret; } |