[CRIU] Re: [PATCH 3/8] eventpoll, inotify: Don't fail on watchees absence

[Cyrill Gorcunov]

On Thu, May 10, 2012 at 06:57:17PM +0400, Cyrill Gorcunov wrote:
> On Thu, May 10, 2012 at 03:07:28PM +0400, Pavel Emelyanov wrote:
> > 
> > Ah, I see. Sorry, there's one entry per tfd in this file, not just one for
> > everyone. I'll take it.
> 
> Pavel, without this patch (in particular inotify part) the current tests might
> fail in case if there is no watchees. So we either should pick up the whole
> series or I could cook one patch for inotify against @master. What you prefer?

Anyway, here is a patch for @master. Andrew, does it fix a problem for you?

	Cyrill
-------------- next part --------------
>From a3f0992cdebf2a4f17966d81cc3e8b4ac8fa883c Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Thu, 10 May 2012 19:04:40 +0400
Subject: [PATCH] inotify: Don't fail on watchees absence

In case if inotify is just created but
not watchee added we should not fail.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 inotify.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/inotify.c b/inotify.c
index d556b30..9b56cda 100644
--- a/inotify.c
+++ b/inotify.c
@@ -168,7 +168,7 @@ static int dump_one_inotify(int lfd, u32 id, const struct fd_parms *p)
 
 	pos = strstr(fdinfo_buf, "wd:");
 	if (!pos)
-		goto parse_error;
+		return 0;
 
 	tok = strtok(pos, "\n");
 	while (tok) {
-- 
1.7.7.6