From 3ef5a5e20ae420fb7409cb6d50e99d4b18a96c8b Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 29 Jun 2017 20:34:00 +0300 Subject: [PATCH] sk-packet: Don't open image when not needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like this call to open_image was left from the times when we reworked packets sending and collected them early. ✓ travis-ci: success for sk-packet: Don't open image when not needed Signed-off-by: Pavel Emelyanov --- criu/sk-queue.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/criu/sk-queue.c b/criu/sk-queue.c index f92d020db..28578b4a7 100644 --- a/criu/sk-queue.c +++ b/criu/sk-queue.c @@ -200,17 +200,12 @@ err_brk: int restore_sk_queue(int fd, unsigned int peer_id) { struct sk_packet *pkt, *tmp; - int ret; - struct cr_img *img; + int ret = -1; pr_info("Trying to restore recv queue for %u\n", peer_id); if (restore_prepare_socket(fd)) - return -1; - - img = open_image(CR_FD_SK_QUEUES, O_RSTR); - if (!img) - return -1; + goto out; list_for_each_entry_safe(pkt, tmp, &packets_list, list) { SkPacketEntry *entry = pkt->entry; @@ -233,21 +228,20 @@ int restore_sk_queue(int fd, unsigned int peer_id) xfree(pkt->data); if (ret < 0) { pr_perror("Failed to send packet"); - goto err; + goto out; } if (ret != entry->length) { pr_err("Restored skb trimmed to %d/%d\n", ret, (unsigned int)entry->length); - goto err; + ret = -1; + goto out; } list_del(&pkt->list); sk_packet_entry__free_unpacked(entry, NULL); xfree(pkt); } - close_image(img); - return 0; -err: - close_image(img); - return -1; + ret = 0; +out: + return ret; }