[CRIU] [PATCH] zdtm/file_locks01: fix testing devices

Andrew Vagin avagin at openvz.org
Wed Sep 2 01:07:26 PDT 2015


Reported-by: Mr Jenkins
Signed-off-by: Andrew Vagin <avagin at openvz.org>
---
 test/zdtm/live/static/file_locks01.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/live/static/file_locks01.c b/test/zdtm/live/static/file_locks01.c
index 1bdff9a..fd74ffe 100644
--- a/test/zdtm/live/static/file_locks01.c
+++ b/test/zdtm/live/static/file_locks01.c
@@ -105,7 +105,10 @@ static int check_file_locks()
 			break;
 		}
 
-		if (i_no != inodes[0] && i_no != inodes[1] && i_no != inodes[2] && makedev(maj, min) != dev)
+		if (i_no != inodes[0] && i_no != inodes[1] && i_no != inodes[2])
+			continue;
+
+		if (makedev(maj, min) != dev)
 			continue;
 
 		if (!strcmp(fl_flag, "FLOCK") && !strcmp(fl_type, "ADVISORY")) {
-- 
2.4.3



More information about the CRIU mailing list