From patchwork Thu Sep  1 16:07:52 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: epoll: Deprecate separate image for TFDs
From: Pavel Emelyanov <xemul@virtuozzo.com>
X-Patchwork-Id: 1511
Message-Id: <57C85258.1020702@virtuozzo.com>
To: CRIU <criu@openvz.org>
Date: Thu, 1 Sep 2016 19:07:52 +0300

TFD entry has been merged into epoll entry in 1.4.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
 criu/eventpoll.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index 5ecabe1..db1e2a2 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -12,6 +12,7 @@
 #include <sys/ioctl.h>
 #include <sys/epoll.h>
 
+#include "crtools.h"
 #include "compiler.h"
 #include "asm/types.h"
 #include "imgset.h"
@@ -198,6 +199,9 @@ static int collect_one_epoll_tfd(void *o, ProtobufCMessage *msg, struct cr_img *
 {
 	struct eventpoll_tfd_file_info *info = o;
 
+	if (!deprecated_ok("Epoll TFD image"))
+		return -1;
+
 	info->tdefe = pb_msg(msg, EventpollTfdEntry);
 	list_add(&info->list, &eventpoll_tfds);
 	pr_info_eventpoll_tfd("Collected ", info->tdefe);