From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D7-0008GH-95 for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RU0D6-0005l5-5J for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D5-0005kz-UN for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:16 -0500 From: Kevin Wolf Date: Fri, 25 Nov 2011 19:12:08 +0100 Message-Id: <1322244735-12516-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com> References: <1322244735-12516-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Dong Xu Wang 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 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