Commit 3ef5a5e2 authored by Pavel Emelyanov's avatar Pavel Emelyanov

sk-packet: Don't open image when not needed

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: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent eda4bc55
...@@ -200,17 +200,12 @@ err_brk: ...@@ -200,17 +200,12 @@ err_brk:
int restore_sk_queue(int fd, unsigned int peer_id) int restore_sk_queue(int fd, unsigned int peer_id)
{ {
struct sk_packet *pkt, *tmp; struct sk_packet *pkt, *tmp;
int ret; int ret = -1;
struct cr_img *img;
pr_info("Trying to restore recv queue for %u\n", peer_id); pr_info("Trying to restore recv queue for %u\n", peer_id);
if (restore_prepare_socket(fd)) if (restore_prepare_socket(fd))
return -1; goto out;
img = open_image(CR_FD_SK_QUEUES, O_RSTR);
if (!img)
return -1;
list_for_each_entry_safe(pkt, tmp, &packets_list, list) { list_for_each_entry_safe(pkt, tmp, &packets_list, list) {
SkPacketEntry *entry = pkt->entry; SkPacketEntry *entry = pkt->entry;
...@@ -233,21 +228,20 @@ int restore_sk_queue(int fd, unsigned int peer_id) ...@@ -233,21 +228,20 @@ int restore_sk_queue(int fd, unsigned int peer_id)
xfree(pkt->data); xfree(pkt->data);
if (ret < 0) { if (ret < 0) {
pr_perror("Failed to send packet"); pr_perror("Failed to send packet");
goto err; goto out;
} }
if (ret != entry->length) { if (ret != entry->length) {
pr_err("Restored skb trimmed to %d/%d\n", pr_err("Restored skb trimmed to %d/%d\n",
ret, (unsigned int)entry->length); ret, (unsigned int)entry->length);
goto err; ret = -1;
goto out;
} }
list_del(&pkt->list); list_del(&pkt->list);
sk_packet_entry__free_unpacked(entry, NULL); sk_packet_entry__free_unpacked(entry, NULL);
xfree(pkt); xfree(pkt);
} }
close_image(img); ret = 0;
return 0; out:
err: return ret;
close_image(img);
return -1;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment