From patchwork Tue Nov 22 02:56:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 126991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 558E71007D1 for ; Tue, 22 Nov 2011 13:57:55 +1100 (EST) Received: from localhost ([::1]:41902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSgYI-0005DM-8H for incoming@patchwork.ozlabs.org; Mon, 21 Nov 2011 21:57:42 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSgYC-0005D6-02 for qemu-devel@nongnu.org; Mon, 21 Nov 2011 21:57:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSgYB-0000DQ-9j for qemu-devel@nongnu.org; Mon, 21 Nov 2011 21:57:35 -0500 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:60733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSgYA-0000D9-Py for qemu-devel@nongnu.org; Mon, 21 Nov 2011 21:57:35 -0500 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 22 Nov 2011 02:45:11 +1000 Received: from d23relay05.au.ibm.com ([202.81.31.247]) by e23smtp04.au.ibm.com ([202.81.31.210]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 22 Nov 2011 02:45:10 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAM2rsmT1798268 for ; Tue, 22 Nov 2011 13:53:57 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAM2vBtZ011097 for ; Tue, 22 Nov 2011 13:57:12 +1100 Received: from wdongxu-T410.cn.ibm.com (wdongxu-t410.cn.ibm.com [9.115.118.147]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAM2v9lG011058; Tue, 22 Nov 2011 13:57:10 +1100 From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 22 Nov 2011 10:56:58 +0800 Message-Id: <1321930618-607-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 x-cbid: 11112116-9264-0000-0000-0000003EAB7A X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.146 Cc: kwolf@redhat.com, Dong Xu Wang , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] block:avoid deadlock in sheepdog.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Dong Xu Wang s->lock should be unlocked before leaving add_aio_request. Signed-off-by: Dong Xu Wang --- 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; }