From patchwork Tue May 14 21:52:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 243836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7B04F2C00A8 for ; Wed, 15 May 2013 07:56:14 +1000 (EST) Received: from localhost ([::1]:54843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcNCe-0006mY-CM for incoming@patchwork.ozlabs.org; Tue, 14 May 2013 17:56:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcNC0-0006mC-80 for qemu-devel@nongnu.org; Tue, 14 May 2013 17:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UcNBx-0003oU-5r for qemu-devel@nongnu.org; Tue, 14 May 2013 17:55:32 -0400 Received: from mail-ie0-x234.google.com ([2607:f8b0:4001:c03::234]:65101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcNBx-0003oO-0a; Tue, 14 May 2013 17:55:29 -0400 Received: by mail-ie0-f180.google.com with SMTP id ar20so2182521iec.39 for ; Tue, 14 May 2013 14:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=+6+htCQLrXCqMu73NiOe+KxoSR+wBWBJfn3ot0liDxE=; b=F/DMu5Jhl5XSt/JfVZiE1hjpi6WFulgtRVIy9ZbphelK7XI/Ip3qKMZuEXK9c5cOQM 1FT0UaudiLssJydQMdOLxJn1yTEcRtO6ycWi9uNz9FgEZvmmsvfg65NGnK9zfDh2iI65 wsufuTebqS7zDf4JspHyN3LxESqGjCoULofmQlqpNEJb51TO357rA3KzoA3TLveDnGQx 9Qf0CaWnKbOltQc/n+0QHxaztKKOfADukansJenrceW0yRJ5nM/k9R0P33aaOfbT1pF3 CSlpW5Mg3vMIvYBXWAmXAwyD/QOIMRDHuHXHUfKP8b38FVRKVxYzxbHtqDDRA23YwUhY B5YQ== X-Received: by 10.50.114.166 with SMTP id jh6mr3571164igb.78.1368568528458; Tue, 14 May 2013 14:55:28 -0700 (PDT) Received: from localhost (cpe-72-177-121-217.austin.res.rr.com. [72.177.121.217]) by mx.google.com with ESMTPSA id q3sm268010igw.0.2013.05.14.14.55.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 May 2013 14:55:27 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 14 May 2013 16:52:58 -0500 Message-Id: <1368568392-2127-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1368568392-2127-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1368568392-2127-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::234 Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 01/15] nbd: unlock mutex in nbd_co_send_request() error path 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: Stefan Hajnoczi Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini (cherry picked from commit 6760c47aa42ce30efdd12c132f73c8749c575995) Signed-off-by: Michael Roth --- block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nbd.c b/block/nbd.c index 6562fd3..d80c9a5 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -274,7 +274,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, ret = qemu_co_sendv(s->sock, qiov->iov, qiov->niov, offset, request->len); if (ret != request->len) { - return -EIO; + rc = -EIO; } } qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,