diff options
author | Dong Xu Wang <wdongxu@linux.vnet.ibm.com> | 2011-11-22 10:56:58 +0800 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-11-22 10:33:43 +0100 |
commit | c3fecea50dc0f27198b8658a0c9c4fbfdd0f95db (patch) | |
tree | 6eb90c13d916bd70d058c878dc2b9ee8700e8c2c | |
parent | 28b77657cfb44cdcc379997340701d73432b9007 (diff) | |
download | qemu-c3fecea50dc0f27198b8658a0c9c4fbfdd0f95db.zip qemu-c3fecea50dc0f27198b8658a0c9c4fbfdd0f95db.tar.gz qemu-c3fecea50dc0f27198b8658a0c9c4fbfdd0f95db.tar.bz2 |
sheepdog: Avoid deadlock in error path
s->lock should be unlocked before leaving add_aio_request.
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | 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; } |