Commit 11d8642a authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

fsnotify: Proceed dumping even if queue has data

It turns out that we can't be too strict about
queued events -- criu itself generates a number
of them and there is no clear way yet how to resolve
this situation. So defer "strict" mode for now
but print a warning.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent b47b0201
...@@ -236,10 +236,8 @@ static int dump_one_inotify(int lfd, u32 id, const struct fd_parms *p) ...@@ -236,10 +236,8 @@ static int dump_one_inotify(int lfd, u32 id, const struct fd_parms *p)
ret = fd_has_data(lfd); ret = fd_has_data(lfd);
if (ret < 0) if (ret < 0)
return -1; return -1;
else if (ret > 0) { else if (ret > 0)
pr_err("The %d inotify has queued events\n", id); pr_warn("The 0x%08x inotify events will be dropped\n", id);
return -1;
}
ie.id = id; ie.id = id;
ie.flags = p->flags; ie.flags = p->flags;
...@@ -348,10 +346,8 @@ static int dump_one_fanotify(int lfd, u32 id, const struct fd_parms *p) ...@@ -348,10 +346,8 @@ static int dump_one_fanotify(int lfd, u32 id, const struct fd_parms *p)
ret = fd_has_data(lfd); ret = fd_has_data(lfd);
if (ret < 0) if (ret < 0)
return -1; return -1;
else if (ret > 0) { else if (ret > 0)
pr_err("The %d inotify has queued events\n", id); pr_warn("The 0x%08x fanotify events will be dropped\n", id);
return -1;
}
ret = -1; ret = -1;
fe.id = id; fe.id = id;
......
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