[CRIU] [PATCH 2/4] fsnotify: Deprecate separate images for marks

Pavel Emelyanov xemul at virtuozzo.com
Mon May 15 07:01:32 PDT 2017


Marks images were merged into regular in 1.3.

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

diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 490ae82..3487d68 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -30,6 +30,7 @@
 #include "filesystems.h"
 #include "image.h"
 #include "util.h"
+#include "crtools.h"
 #include "files.h"
 #include "files-reg.h"
 #include "file-ids.h"
@@ -901,6 +902,9 @@ static int collect_one_inotify_mark(void *o, ProtobufCMessage *msg, struct cr_im
 {
 	struct fsnotify_mark_info *mark = o;
 
+	if (!deprecated_ok("separate images for fsnotify marks"))
+		return -1;
+
 	mark->iwe = pb_msg(msg, InotifyWdEntry);
 	INIT_LIST_HEAD(&mark->list);
 	mark->remap = NULL;
@@ -929,6 +933,9 @@ static int collect_one_fanotify_mark(void *o, ProtobufCMessage *msg, struct cr_i
 {
 	struct fsnotify_mark_info *mark = o;
 
+	if (!deprecated_ok("separate images for fsnotify marks"))
+		return -1;
+
 	mark->fme = pb_msg(msg, FanotifyMarkEntry);
 	INIT_LIST_HEAD(&mark->list);
 	mark->remap = NULL;
-- 
2.1.4



More information about the CRIU mailing list