protobuf: Drop old sk_opts_entry structure

We've switched to SkOptsEntry, no need to carry this
obsolete one.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

include/image.h

@@ -69,13 +69,6 @@ enum fd_types {
 
 #define USK_EXTERN	(1 << 0)
 
-struct sk_opts_entry {
-	u32	so_sndbuf;
-	u32	so_rcvbuf;
-	u64	so_snd_tmo[2];
-	u64	so_rcv_tmo[2];
-};
-
 struct vma_entry {
 	u64	start;
 	u64	end;

include/sockets.h

@@ -26,13 +26,9 @@ struct socket_desc {
 };
 
 extern int dump_socket(struct fd_parms *p, int lfd, const struct cr_fdset *cr_fdset);
-extern int dump_socket_opts(int sk, struct sk_opts_entry *soe);
-extern int restore_socket_opts(int sk, struct sk_opts_entry *soe);
-extern void show_socket_opts(struct sk_opts_entry *soe);
-
-extern int pb_restore_socket_opts(int sk, SkOptsEntry *soe);
-extern int pb_dump_socket_opts(int sk, SkOptsEntry *soe);
-extern void pb_show_socket_opts(SkOptsEntry *soe);
+extern int dump_socket_opts(int sk, SkOptsEntry *soe);
+extern int restore_socket_opts(int sk, SkOptsEntry *soe);
+extern void show_socket_opts(SkOptsEntry *soe);
 
 extern int sk_collect_one(int ino, int family, struct socket_desc *d);
 extern int collect_sockets(void);

sk-inet.c

@@ -209,7 +209,7 @@ static int dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p)
 	memcpy(ie.src_addr, sk->src_addr, sizeof(u32) * 4);
 	memcpy(ie.dst_addr, sk->dst_addr, sizeof(u32) * 4);
 
-	if (pb_dump_socket_opts(lfd, &skopts))
+	if (dump_socket_opts(lfd, &skopts))
 		goto err;
 
 	if (pb_write(fdset_fd(glob_fdset, CR_FD_INETSK), &ie, inet_sk_entry))
@@ -390,7 +390,7 @@ done:
 	if (rst_file_params(sk, ii->ie->fown, ii->ie->flags))
 		goto err;
 
-	if (pb_restore_socket_opts(sk, ii->ie->opts))
+	if (restore_socket_opts(sk, ii->ie->opts))
 		return -1;
 
 	return sk;
@@ -501,7 +501,7 @@ void show_inetsk(int fd, struct cr_options *o)
 			ie->id, ie->ino, skfamily2s(ie->family), sktype2s(ie->type), skproto2s(ie->proto),
 			skstate2s(ie->state), src_addr, ie->src_port, dst_addr, ie->dst_port, ie->flags);
 		pr_msg("\t"), show_fown_cont(ie->fown), pr_msg("\n");
-		pb_show_socket_opts(ie->opts);
+		show_socket_opts(ie->opts);
 
 		inet_sk_entry__free_unpacked(ie, NULL);
 	}

sk-unix.c

@@ -195,7 +195,7 @@ static int dump_one_unix_fd(int lfd, u32 id, const struct fd_parms *p)
 				ue.ino, ue.peer);
 	}
 
-	if (pb_dump_socket_opts(lfd, &skopts))
+	if (dump_socket_opts(lfd, &skopts))
 		goto err;
 
 	if (pb_write(fdset_fd(glob_fdset, CR_FD_UNIXSK), &ue, unix_sk_entry))
@@ -470,7 +470,7 @@ void show_unixsk(int fd, struct cr_options *o)
 		pr_msg("\n");
 
 		if (ue->opts)
-			pb_show_socket_opts(ue->opts);
+			show_socket_opts(ue->opts);
 		unix_sk_entry__free_unpacked(ue, NULL);
 	}
 out:
@@ -540,7 +540,7 @@ try_again:
 		if (rst_file_params(fle->fe->fd, ui->ue->fown, ui->ue->flags))
 			return -1;
 
-		if (pb_restore_socket_opts(fle->fe->fd, ui->ue->opts))
+		if (restore_socket_opts(fle->fe->fd, ui->ue->opts))
 			return -1;
 
 		cj = cj->next;
@@ -651,7 +651,7 @@ static int open_unixsk_pair_slave(struct unix_sk_info *ui)
 	if (rst_file_params(sk, ui->ue->fown, ui->ue->flags))
 		return -1;
 
-	if (pb_restore_socket_opts(sk, ui->ue->opts))
+	if (restore_socket_opts(sk, ui->ue->opts))
 		return -1;
 
 	return sk;
@@ -683,7 +683,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui)
 		if (rst_file_params(sk, ui->ue->fown, ui->ue->flags))
 			return -1;
 
-		if (pb_restore_socket_opts(sk, ui->ue->opts))
+		if (restore_socket_opts(sk, ui->ue->opts))
 			return -1;
 
 	} else if (ui->peer) {

sockets.c

@@ -63,7 +63,7 @@ static int do_restore_opt(int sk, int name, void *val, int len)
 
 #define restore_opt(s, n, f)	do_restore_opt(s, n, f, sizeof(*f))
 
-int pb_restore_socket_opts(int sk, SkOptsEntry *soe)
+int restore_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0;
 	struct timeval tv;
@@ -82,18 +82,6 @@ int pb_restore_socket_opts(int sk, SkOptsEntry *soe)
 	return ret;
 }
 
-int restore_socket_opts(int sk, struct sk_opts_entry *soe)
-{
-	int ret = 0;
-
-	ret |= restore_opt(sk, SO_SNDBUFFORCE, &soe->so_sndbuf);
-	ret |= restore_opt(sk, SO_RCVBUFFORCE, &soe->so_rcvbuf);
-	ret |= restore_opt(sk, SO_SNDTIMEO, &soe->so_snd_tmo);
-	ret |= restore_opt(sk, SO_RCVTIMEO, &soe->so_rcv_tmo);
-
-	return ret;
-}
-
 int do_dump_opt(int sk, int name, void *val, int len)
 {
 	socklen_t aux = len;
@@ -114,19 +102,7 @@ int do_dump_opt(int sk, int name, void *val, int len)
 
 #define dump_opt(s, n, f)	do_dump_opt(s, n, f, sizeof(*f))
 
-int dump_socket_opts(int sk, struct sk_opts_entry *soe)
-{
-	int ret = 0;
-
-	ret |= dump_opt(sk, SO_SNDBUF, &soe->so_sndbuf);
-	ret |= dump_opt(sk, SO_RCVBUF, &soe->so_rcvbuf);
-	ret |= dump_opt(sk, SO_SNDTIMEO, &soe->so_snd_tmo);
-	ret |= dump_opt(sk, SO_RCVTIMEO, &soe->so_rcv_tmo);
-
-	return ret;
-}
-
-int pb_dump_socket_opts(int sk, SkOptsEntry *soe)
+int dump_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0;
 	struct timeval tv;
@@ -402,29 +378,7 @@ char *skstate2s(u32 state)
 		return unknown(state);
 }
 
-static void sk_show_timeval(char *name, u64 *tmo)
-{
-	struct timeval tv;
-
-	tv.tv_sec = tmo[0];
-	tv.tv_usec = tmo[1];
-
-	pr_msg("%s: %lu.%lu  ", name, tv.tv_sec, tv.tv_usec);
-}
-
-void show_socket_opts(struct sk_opts_entry *soe)
-{
-	pr_msg("\t");
-
-	pr_msg("sndbuf: %u  ", soe->so_sndbuf);
-	pr_msg("rcvbuf: %u  ", soe->so_rcvbuf);
-	sk_show_timeval("sndtmo", soe->so_snd_tmo);
-	sk_show_timeval("rcvtmo", soe->so_rcv_tmo);
-
-	pr_msg("\n");
-}
-
-void pb_show_socket_opts(SkOptsEntry *soe)
+void show_socket_opts(SkOptsEntry *soe)
 {
 	pr_msg("\t");