multifd: Remove some redundant code
Clean up some unnecessary code Signed-off-by: Li Zhang <lizhang@suse.de> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
e3f37b2ce6
commit
bca762c2b9
|
@ -892,19 +892,15 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
|
|||
Error *local_err = NULL;
|
||||
|
||||
trace_multifd_new_send_channel_async(p->id);
|
||||
if (qio_task_propagate_error(task, &local_err)) {
|
||||
goto cleanup;
|
||||
} else {
|
||||
if (!qio_task_propagate_error(task, &local_err)) {
|
||||
p->c = QIO_CHANNEL(sioc);
|
||||
qio_channel_set_delay(p->c, false);
|
||||
p->running = true;
|
||||
if (!multifd_channel_connect(p, sioc, local_err)) {
|
||||
goto cleanup;
|
||||
if (multifd_channel_connect(p, sioc, local_err)) {
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
multifd_new_send_channel_cleanup(p, sioc, local_err);
|
||||
}
|
||||
|
||||
|
@ -1115,10 +1111,7 @@ static void *multifd_recv_thread(void *opaque)
|
|||
|
||||
ret = qio_channel_read_all_eof(p->c, (void *)p->packet,
|
||||
p->packet_len, &local_err);
|
||||
if (ret == 0) { /* EOF */
|
||||
break;
|
||||
}
|
||||
if (ret == -1) { /* Error */
|
||||
if (ret == 0 || ret == -1) { /* 0: EOF -1: Error */
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue