diff options
| author | Fam Zheng <famz@redhat.com> | 2017-04-10 21:00:50 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-04-11 20:07:15 +0800 |
| commit | 49ca6259131c6b0555845fcac3e34467c8ac37eb (patch) | |
| tree | 0cdf24cc68a55986272aeb7bd5b08ace80618032 /block | |
| parent | e92f0e1910f0655a0edd8d87c5a7262d36517a89 (diff) | |
block: Fix bdrv_co_flush early return
bdrv_inc_in_flight and bdrv_dec_in_flight are mandatory for
BDRV_POLL_WHILE to work, even for the shortcut case where flush is
unnecessary. Move the if block to below bdrv_dec_in_flight, and BTW fix
the variable declaration position.
Signed-off-by: Fam Zheng <famz@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/io.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/block/io.c b/block/io.c index 00e45ca219..bae6947032 100644 --- a/block/io.c +++ b/block/io.c @@ -2278,16 +2278,17 @@ static void coroutine_fn bdrv_flush_co_entry(void *opaque) int coroutine_fn bdrv_co_flush(BlockDriverState *bs) { - int ret; + int current_gen; + int ret = 0; + + bdrv_inc_in_flight(bs); if (!bs || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs) || bdrv_is_sg(bs)) { - return 0; + goto early_exit; } - bdrv_inc_in_flight(bs); - - int current_gen = bs->write_gen; + current_gen = bs->write_gen; /* Wait until any previous flushes are completed */ while (bs->active_flush_req) { @@ -2370,6 +2371,7 @@ out: /* Return value is ignored - it's ok if wait queue is empty */ qemu_co_queue_next(&bs->flush_queue); +early_exit: bdrv_dec_in_flight(bs); return ret; } |