[CRIU] [PATCH 1/3] unix: Do not restore parms and opts twice

Pavel Emelyanov xemul at virtuozzo.com
Tue Feb 14 01:47:45 PST 2017


After returning 1 from open_unixsk_standalone() the engine
would call post_open on it so rst_file_params() and
restore_socket_opts() will be called again.

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/sk-unix.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 5a69cd2..23d29b6 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1292,12 +1292,6 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 		wake_connected_sockets(ui);
 	}
 out:
-	if (rst_file_params(sk, ui->ue->fown, ui->ue->flags))
-		return -1;
-
-	if (restore_socket_opts(sk, ui->ue->opts))
-		return -1;
-
 	*new_fd = sk;
 	return 1;
 }
-- 
2.5.0


More information about the CRIU mailing list