[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/14] file-posix: Simplify raw_co_prw's 'out' zone code
From: |
Hanna Czenczek |
Subject: |
[PULL 13/14] file-posix: Simplify raw_co_prw's 'out' zone code |
Date: |
Fri, 1 Sep 2023 10:19:22 +0200 |
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>
---
block/file-posix.c | 18 +++++-------------
1 file 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;
}
--
2.41.0
- [PULL 02/14] test-throttle: use enum ThrottleDirection, (continued)
- [PULL 02/14] test-throttle: use enum ThrottleDirection, Hanna Czenczek, 2023/09/01
- [PULL 03/14] throttle: support read-only and write-only, Hanna Czenczek, 2023/09/01
- [PULL 01/14] throttle: introduce enum ThrottleDirection, Hanna Czenczek, 2023/09/01
- [PULL 04/14] test-throttle: test read only and write only, Hanna Czenczek, 2023/09/01
- [PULL 06/14] throttle: use enum ThrottleDirection instead of bool is_write, Hanna Czenczek, 2023/09/01
- [PULL 07/14] throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code, Hanna Czenczek, 2023/09/01
- [PULL 05/14] cryptodev: use NULL throttle timer cb for read direction, Hanna Czenczek, 2023/09/01
- [PULL 08/14] fsdev: Use ThrottleDirection instread of bool is_write, Hanna Czenczek, 2023/09/01
- [PULL 10/14] file-posix: Clear bs->bl.zoned on error, Hanna Czenczek, 2023/09/01
- [PULL 11/14] file-posix: Check bs->bl.zoned for zone info, Hanna Czenczek, 2023/09/01
- [PULL 13/14] file-posix: Simplify raw_co_prw's 'out' zone code,
Hanna Czenczek <=
- [PULL 12/14] file-posix: Fix zone update in I/O error path, Hanna Czenczek, 2023/09/01
- [PULL 14/14] tests/file-io-error: New test, Hanna Czenczek, 2023/09/01
- [PULL 09/14] block/throttle-groups: Use ThrottleDirection instread of bool is_write, Hanna Czenczek, 2023/09/01
- Re: [PULL 00/14] Block patches, Stefan Hajnoczi, 2023/09/06