[Devel] [PATCH RHEL9 COMMIT] Revert "drivers/vhost: queue vhost_blk works at vq workers"

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-70.22.1.vz9.17.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-70.22.1.vz9.17.9
------>
commit 1d748d3e5967ad92d94dec49de95a32fdcfc1f14
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Wed Nov 16 15:55:02 2022 +0300

    Revert "drivers/vhost: queue vhost_blk works at vq workers"
    
    This reverts commit 2ee395511d672cf9374de027c5ad39f6b181a6a5.
    
    Will apply v5 of the patchset.
    https://jira.sw.ru/browse/PSBM-139414
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 drivers/vhost/blk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c
index e0bc53fc166d..c62b8ae70716 100644
--- a/drivers/vhost/blk.c
+++ b/drivers/vhost/blk.c
@@ -161,12 +161,13 @@ static inline int vhost_blk_set_status(struct vhost_blk_req *req, u8 status)
 static void vhost_blk_req_done(struct bio *bio)
 {
 	struct vhost_blk_req *req = bio->bi_private;
+	struct vhost_blk *blk = req->blk;
 
 	req->bio_err = blk_status_to_errno(bio->bi_status);
 
 	if (atomic_dec_and_test(&req->bio_nr)) {
 		llist_add(&req->llnode, &req->blk_vq->llhead);
-		vhost_work_queue_vq(&req->blk_vq->vq, &req->blk_vq->work);
+		vhost_work_queue(&blk->dev, &req->blk_vq->work);
 	}
 
 	bio_put(bio);