[CRIU] [PATCH 2/2] files: Allow epolls sent over unix socket

Kirill Tkhai ktkhai at virtuozzo.com
Wed Jan 24 17:49:38 MSK 2018


Since epoll restore is split in two parts,
epoll_create() does not depend on another
files state. Since epoll is created, it
can be sent to everywhere. So, there is
no circular dependences, and we allow epolls
sent over unix socket.

Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 criu/sk-queue.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/criu/sk-queue.c b/criu/sk-queue.c
index f3ebd6c64..7f5aa1d58 100644
--- a/criu/sk-queue.c
+++ b/criu/sk-queue.c
@@ -102,11 +102,10 @@ static int dump_scm_rights(struct cmsghdr *ch, SkPacketEntry *pe)
 			return -1;
 
 		/*
-		 * Unix sent over Unix or Epoll with some other sh*t
-		 * sent over unix (maybe with this very unix polled)
-		 * are tricky and not supported for now. (XXX -- todo)
+		 * Unix sent over Unix are tricky and not supported
+		 * for now. (XXX -- todo).
 		 */
-		if (ftyp == FD_TYPES__UNIXSK || ftyp == FD_TYPES__EVENTPOLL) {
+		if (ftyp == FD_TYPES__UNIXSK) {
 			pr_err("Can't dump send %d (unix/epoll) fd\n", ftyp);
 			return -1;
 		}



More information about the CRIU mailing list