From patchwork Tue Aug 23 16:28:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 111144 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 BB22EB70B7 for ; Wed, 24 Aug 2011 02:34:22 +1000 (EST) Received: from localhost ([::1]:33737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvtvd-000340-Gw for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 12:34:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvtvU-000331-Cp for qemu-devel@nongnu.org; Tue, 23 Aug 2011 12:34:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvtvT-0000rD-Cv for qemu-devel@nongnu.org; Tue, 23 Aug 2011 12:34:08 -0400 Received: from cobra.newdream.net ([66.33.216.30]:55933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvtvR-0000qp-6C for qemu-devel@nongnu.org; Tue, 23 Aug 2011 12:34:07 -0400 Received: from localhost.localdomain (aon.hq.newdream.net [64.111.111.107]) by cobra.newdream.net (Postfix) with ESMTPA id A3070BC802; Tue, 23 Aug 2011 09:39:03 -0700 (PDT) From: Sage Weil To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 09:28:32 -0700 Message-Id: <1314116912-28685-3-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1314116912-28685-1-git-send-email-sage@newdream.net> References: <1314116912-28685-1-git-send-email-sage@newdream.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 66.33.216.30 Cc: Sage Weil Subject: [Qemu-devel] [PATCH 3/3] rbd: clean up, fix style 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 No assignment in condition. Remove duplicate ret > 0 check. Signed-off-by: Sage Weil Reviewed-by: Stefan Hajnoczi --- block/rbd.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index e239e04..5423a2d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -391,15 +391,14 @@ static void qemu_rbd_aio_event_reader(void *opaque) char *p = (char *)&s->event_rcb; /* now read the rcb pointer that was sent from a non qemu thread */ - if ((ret = read(s->fds[RBD_FD_READ], p + s->event_reader_pos, - sizeof(s->event_rcb) - s->event_reader_pos)) > 0) { - if (ret > 0) { - s->event_reader_pos += ret; - if (s->event_reader_pos == sizeof(s->event_rcb)) { - s->event_reader_pos = 0; - qemu_rbd_complete_aio(s->event_rcb); - s->qemu_aio_count--; - } + ret = read(s->fds[RBD_FD_READ], p + s->event_reader_pos, + sizeof(s->event_rcb) - s->event_reader_pos); + if (ret > 0) { + s->event_reader_pos += ret; + if (s->event_reader_pos == sizeof(s->event_rcb)) { + s->event_reader_pos = 0; + qemu_rbd_complete_aio(s->event_rcb); + s->qemu_aio_count--; } } } while (ret < 0 && errno == EINTR);