Unverified Commit 97a32f07 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15176 virtio-blk: don't keep queue frozen during system suspend 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Qixing <zhengqixing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7FWVJ2MDETJFUGWME2R3CDHB2JX4MESX/ 
 
https://gitee.com/openeuler/kernel/issues/IBJ6SJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/15176

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ff870734 49da1910

drivers/block/virtio_blk.c

+5 −2
Original line number Diff line number Diff line
@@ -1598,9 +1598,12 @@ static void virtblk_remove(struct virtio_device *vdev) 
static int virtblk_freeze(struct virtio_device *vdev)

{

	struct virtio_blk *vblk = vdev->priv;

	struct request_queue *q = vblk->disk->queue;



	/* Ensure no requests in virtqueues before deleting vqs. */

	blk_mq_freeze_queue(vblk->disk->queue);

	blk_mq_freeze_queue(q);

	blk_mq_quiesce_queue_nowait(q);

	blk_mq_unfreeze_queue(q);



	/* Ensure we don't receive any more interrupts */

	virtio_reset_device(vdev);
@@ -1624,8 +1627,8 @@ static int virtblk_restore(struct virtio_device *vdev) 
		return ret;



	virtio_device_ready(vdev);

	blk_mq_unquiesce_queue(vblk->disk->queue);



	blk_mq_unfreeze_queue(vblk->disk->queue);

	return 0;

}

#endif