[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path |
Date: |
Fri, 25 Nov 2011 19:12:08 +0100 |
From: Dong Xu Wang <address@hidden>
s->lock should be unlocked before leaving add_aio_request.
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/sheepdog.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 9f80609..62f1f3a 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1116,6 +1116,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
/* send a header */
ret = do_write(s->fd, &hdr, sizeof(hdr));
if (ret) {
+ qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a req, %s", strerror(errno));
return -EIO;
}
@@ -1123,6 +1124,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
if (wlen) {
ret = do_writev(s->fd, iov, wlen, aio_req->iov_offset);
if (ret) {
+ qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a data, %s", strerror(errno));
return -EIO;
}
--
1.7.6.4
- [Qemu-devel] [PULL 00/12] Block patches for 1.0, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 01/12] virtio-blk: fix cross-endian config space, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 02/12] usb-msd: do not register twice in the boot order, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 04/12] scsi-generic: add as boot device, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 03/12] scsi: fix fw path, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path,
Kevin Wolf <=
- [Qemu-devel] [PATCH 06/12] qcow: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 07/12] vdi: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 08/12] vmdk: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 10/12] vvfat: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 12/12] vpc: Add missing error handling in alloc_block, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 11/12] vdi: Fix memory leak, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 09/12] vpc: Add migration blocker, Kevin Wolf, 2011/11/25
- Re: [Qemu-devel] [PULL 00/12] Block patches for 1.0, Anthony Liguori, 2011/11/28