From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Sage Weil Date: Tue, 23 Aug 2011 09:28:32 -0700 Message-Id: <1314116912-28685-3-git-send-email-sage@newdream.net> In-Reply-To: <1314116912-28685-1-git-send-email-sage@newdream.net> References: <1314116912-28685-1-git-send-email-sage@newdream.net> Subject: [Qemu-devel] [PATCH 3/3] rbd: clean up, fix style List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sage Weil No assignment in condition. Remove duplicate ret > 0 check. Signed-off-by: Sage Weil --- 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); -- 1.7.0