packages/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi-bus: fix unmatched object_unref()

Browse Source 
Fix commit 391dd8f1("scsi-bus: Refactor the code that retries requests"),
which split scsi_dma_restart_bh(), but the object_unref() belongs to
scsi_dma_restart_bh().
So, we should mv object_unref() from scsi_retry_requests() to
scsi_dma_restart_bh().

Signed-off-by: Yan Wang <wangyan122@huawei.com>
This commit is contained in:
Chen Qun 2022-03-01 20:12:12 +08:00 committed by yezengruan
parent 846e2a19aa
commit 8d34e515a0
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scsi-bus-fix-unmatched-object_unref.patch Normal file
View File

@ -0,0 +1,42 @@
From 239ffdcf42e0795b5f025f87fa19ce01642811f2 Mon Sep 17 00:00:00 2001
From: Yan Wang <wangyan122@huawei.com>
Date: Tue, 1 Mar 2022 20:12:12 +0800
Subject: [PATCH] scsi-bus: fix unmatched object_unref()
Fix commit 391dd8f1("scsi-bus: Refactor the code that retries requests"),
which split scsi_dma_restart_bh(), but the object_unref() belongs to
scsi_dma_restart_bh().
So, we should mv object_unref() from scsi_retry_requests() to
scsi_dma_restart_bh().
Signed-off-by: Yan Wang <wangyan122@huawei.com>
---
hw/scsi/scsi-bus.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 5e6f891b9d..9d37f490ce 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -166,8 +166,6 @@ void scsi_retry_requests(SCSIDevice *s)
scsi_req_unref(req);
}
aio_context_release(blk_get_aio_context(s->conf.blk));
- /* Drop the reference that was acquired in scsi_dma_restart_cb */
- object_unref(OBJECT(s));
}
static void scsi_dma_restart_bh(void *opaque)
@@ -178,6 +176,9 @@ static void scsi_dma_restart_bh(void *opaque)
s->bh = NULL;
scsi_retry_requests(s);
+
+ /* Drop the reference that was acquired in scsi_dma_restart_cb */
+ object_unref(OBJECT(s));
}
void scsi_req_retry(SCSIRequest *req)
--
2.27.0