From patchwork Tue Apr 3 10:04:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 150367 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 F3D15B6FE6 for ; Tue, 3 Apr 2012 20:04:53 +1000 (EST) Received: from localhost ([::1]:50825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0bb-0004n3-QR for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2012 06:04:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0bP-0004mh-LW for qemu-devel@nongnu.org; Tue, 03 Apr 2012 06:04:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF0bJ-0008JF-CA for qemu-devel@nongnu.org; Tue, 03 Apr 2012 06:04:39 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:36361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0bJ-0008J3-5L for qemu-devel@nongnu.org; Tue, 03 Apr 2012 06:04:33 -0400 Received: by yhoo21 with SMTP id o21so2284419yho.4 for ; Tue, 03 Apr 2012 03:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vPMa/XFsSD1/iPAzIwXXkwb0fxbvK2QiW5zBsLc2Ht4=; b=yuxbzkbfbgZ1ikKfPqIA3jQhErLHrV1xLA2tBDOAYirtiJmCtnqHFJ0yIA5ba3QP0X bjqIlLau5Xoq6TpzBBuBe+rf6P6thXEEfVQANuEwJEI6sWwEGSUy9y3ZRZkdCFbioUpZ 42oUfkXfhPQAqZ25hUi0OBCBnUNaJgNW12npMwxemCRBTfbGXvIl1dcyhx05/6lzI4tE a+UTi4uyejH1h0AZgHLnGb1KBXV5D9QxNkRjIVNG+3IZpH+ewTUGv4rDXhJDRHbmPrTc wwkzOLMGK07jV2Y8RXQzdK4QXspprLMqzjmsra7d2+Aa2nLo8H7ZGgtXvAYYp+xmKpO1 InZA== Received: by 10.50.202.38 with SMTP id kf6mr8049045igc.30.1333447471358; Tue, 03 Apr 2012 03:04:31 -0700 (PDT) Received: from localhost.localdomain ([123.119.187.149]) by mx.google.com with ESMTPS id wp5sm14961890igc.16.2012.04.03.03.04.24 (version=SSLv3 cipher=OTHER); Tue, 03 Apr 2012 03:04:30 -0700 (PDT) From: Liu Yuan To: qemu-devel@nongnu.org Date: Tue, 3 Apr 2012 18:04:21 +0800 Message-Id: <1333447461-317-1-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.8.2 In-Reply-To: <4F7ABF13.4060305@redhat.com> References: <4F7ABF13.4060305@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.45 Cc: Kevin Wolf , MORITA Kazutaka Subject: [Qemu-devel] RE. [PATCH] sheepdog: fix send req helpers 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: Liu Yuan Yes, I think so. Here is the patch. Subject: [PATCH] sheepdog: fix send req helpers From: Liu Yuan We should return if reading of the header fails. Cc: Kevin Wolf Cc: MORITA Kazutaka Signed-off-by: Liu Yuan Acked-by: MORITA Kazutaka --- block/sheepdog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 62dfa48..73308b2 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -510,6 +510,7 @@ static int send_req(int sockfd, SheepdogReq *hdr, void *data, ret = qemu_send_full(sockfd, hdr, sizeof(*hdr), 0); if (ret < sizeof(*hdr)) { error_report("failed to send a req, %s", strerror(errno)); + return ret; } ret = qemu_send_full(sockfd, data, *wlen, 0); @@ -528,6 +529,7 @@ static int send_co_req(int sockfd, SheepdogReq *hdr, void *data, ret = qemu_co_send(sockfd, hdr, sizeof(*hdr)); if (ret < sizeof(*hdr)) { error_report("failed to send a req, %s", strerror(errno)); + return ret; } ret = qemu_co_send(sockfd, data, *wlen);