Commit 80f84ab0 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Andrei Vagin

fsnotify: Deprecate separate images for marks

Marks images were merged into regular in 1.3.

✓ travis-ci: success for Sanitize fsnotify legacy code
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 4bd43e22
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "filesystems.h" #include "filesystems.h"
#include "image.h" #include "image.h"
#include "util.h" #include "util.h"
#include "crtools.h"
#include "files.h" #include "files.h"
#include "files-reg.h" #include "files-reg.h"
#include "file-ids.h" #include "file-ids.h"
...@@ -909,6 +910,9 @@ static int collect_one_inotify_mark(void *o, ProtobufCMessage *msg, struct cr_im ...@@ -909,6 +910,9 @@ static int collect_one_inotify_mark(void *o, ProtobufCMessage *msg, struct cr_im
{ {
struct fsnotify_mark_info *mark = o; struct fsnotify_mark_info *mark = o;
if (!deprecated_ok("separate images for fsnotify marks"))
return -1;
mark->iwe = pb_msg(msg, InotifyWdEntry); mark->iwe = pb_msg(msg, InotifyWdEntry);
INIT_LIST_HEAD(&mark->list); INIT_LIST_HEAD(&mark->list);
mark->remap = NULL; mark->remap = NULL;
...@@ -937,6 +941,9 @@ static int collect_one_fanotify_mark(void *o, ProtobufCMessage *msg, struct cr_i ...@@ -937,6 +941,9 @@ static int collect_one_fanotify_mark(void *o, ProtobufCMessage *msg, struct cr_i
{ {
struct fsnotify_mark_info *mark = o; struct fsnotify_mark_info *mark = o;
if (!deprecated_ok("separate images for fsnotify marks"))
return -1;
mark->fme = pb_msg(msg, FanotifyMarkEntry); mark->fme = pb_msg(msg, FanotifyMarkEntry);
INIT_LIST_HEAD(&mark->list); INIT_LIST_HEAD(&mark->list);
mark->remap = NULL; mark->remap = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment