openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rbd: clean up, fix style 

No assignment in condition.  Remove duplicate ret > 0 check.

Signed-off-by: Sage Weil <sage@newdream.net>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Sage Weil 2011-09-07 09:28:05 -07:00 committed by Kevin Wolf
parent 7c7e9df023
commit dfe80b071b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/rbd.c
View File

@ -391,8 +391,8 @@ static void qemu_rbd_aio_event_reader(void *opaque)
char *p = (char *)&s->event_rcb; char *p = (char *)&s->event_rcb;
/* now read the rcb pointer that was sent from a non qemu thread */ /* 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, ret = read(s->fds[RBD_FD_READ], p + s->event_reader_pos,
sizeof(s->event_rcb) - s->event_reader_pos)) > 0) { sizeof(s->event_rcb) - s->event_reader_pos);
if (ret > 0) { if (ret > 0) {
s->event_reader_pos += ret; s->event_reader_pos += ret;
if (s->event_reader_pos == sizeof(s->event_rcb)) { if (s->event_reader_pos == sizeof(s->event_rcb)) {
@ -401,7 +401,6 @@ static void qemu_rbd_aio_event_reader(void *opaque)
s->qemu_aio_count--; s->qemu_aio_count--;
} }
} }
}
} while (ret < 0 && errno == EINTR); } while (ret < 0 && errno == EINTR);
} }