From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jv-0001fb-Sl for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Jm-00073s-7P for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jl-00072J-U9 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:02 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:16 +0200 Message-Id: <1315837174-15327-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/35] rbd: clean up, fix style List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Sage Weil No assignment in condition. Remove duplicate ret > 0 check. Signed-off-by: Sage Weil Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/rbd.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 6135fc1..2763092 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); -- 1.7.6