epoll: Deprecate separate image for TFDs

Submitted by Pavel Emelianov on Sept. 1, 2016, 4:07 p.m.

Details

Message ID 57C85258.1020702@virtuozzo.com
State Rejected
Series "epoll: Deprecate separate image for TFDs"
Headers show

Commit Message

Pavel Emelianov Sept. 1, 2016, 4:07 p.m.
TFD entry has been merged into epoll entry in 1.4.

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

Patch hide | download patch | download mbox

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);

Comments

Cyrill Gorcunov Sept. 1, 2016, 4:22 p.m.
On Thu, Sep 01, 2016 at 07:07:52PM +0300, Pavel Emelyanov wrote:
> 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>