Commit 632a7735 authored by Zhengui's avatar Zhengui Committed by Stefan Hajnoczi
Browse files

block: all I/O should be completed before removing throttle timers. 



In blk_remove_bs, all I/O should be completed before removing throttle
timers. If there has inflight I/O, removing throttle timers here will
cause the inflight I/O never return.
This patch add bdrv_drained_begin before throttle_timers_detach_aio_context
to let all I/O completed before removing throttle timers.

[Moved declaration of bs as suggested by Alberto Garcia
<berto@igalia.com>.
--Stefan]

Signed-off-by: default avatarZhengui <lizhengui@huawei.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 1508564040-120700-1-git-send-email-lizhengui@huawei.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 508ba0f7

block/block-backend.c

+4 −0
Original line number Diff line number Diff line
@@ -655,12 +655,16 @@ BlockBackend *blk_by_public(BlockBackendPublic *public) 
 */

void blk_remove_bs(BlockBackend *blk)

{

    BlockDriverState *bs;

    ThrottleTimers *tt;



    notifier_list_notify(&blk->remove_bs_notifiers, blk);

    if (blk->public.throttle_group_member.throttle_state) {

        tt = &blk->public.throttle_group_member.throttle_timers;

        bs = blk_bs(blk);

        bdrv_drained_begin(bs);

        throttle_timers_detach_aio_context(tt);

        bdrv_drained_end(bs);

    }



    blk_update_root_state(blk);