[CRIU] [PATCH 1/3] flock: Don't hide image read error on flocks restore

Pavel Emelyanov xemul at parallels.com
Wed Aug 6 10:08:16 PDT 2014


Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 file-lock.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/file-lock.c b/file-lock.c
index 5276d2e..dbc687c 100644
--- a/file-lock.c
+++ b/file-lock.c
@@ -241,15 +241,11 @@ static int restore_file_locks(int pid)
 
 		ret = restore_file_lock(fle);
 		file_lock_entry__free_unpacked(fle, NULL);
-
 		if (ret)
-			goto err;
+			break;
 	}
 
 	close_safe(&fd);
-	return 0;
-err:
-	close_safe(&fd);
 	return ret;
 }
 
-- 
1.8.4.2




More information about the CRIU mailing list