From c3fecea50dc0f27198b8658a0c9c4fbfdd0f95db Mon Sep 17 00:00:00 2001 From: Dong Xu Wang Date: Tue, 22 Nov 2011 10:56:58 +0800 Subject: [PATCH] sheepdog: Avoid deadlock in error path s->lock should be unlocked before leaving add_aio_request. Signed-off-by: Dong Xu Wang Signed-off-by: Kevin Wolf --- block/sheepdog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index 9f8060960f..62f1f3a0cf 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; } -- 2.11.4.GIT