[CRIU] [PATCH 01/15] img: Keep the copy of flags value in open_image_at

Pavel Emelyanov xemul at parallels.com
Mon Sep 29 01:46:47 PDT 2014


We drop the O_OPT from flags and will drop one more. So
instead of a set of bools let's have the flags copy at
hands.

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/image.c b/image.c
index 566073b..bc2d69d 100644
--- a/image.c
+++ b/image.c
@@ -199,7 +199,7 @@ struct cr_fdset *cr_glob_fdset_open(int mode)
 
 int open_image_at(int dfd, int type, unsigned long flags, ...)
 {
-	bool optional = !!(flags & O_OPT);
+	unsigned long oflags = flags;
 	char path[PATH_MAX];
 	va_list args;
 	int ret;
@@ -212,7 +212,7 @@ int open_image_at(int dfd, int type, unsigned long flags, ...)
 
 	ret = openat(dfd, path, flags, CR_FD_PERM);
 	if (ret < 0) {
-		if (optional && errno == ENOENT)
+		if ((oflags & O_OPT) && errno == ENOENT)
 			return -ENOENT;
 		pr_perror("Unable to open %s", path);
 		goto err;
-- 
1.8.4.2




More information about the CRIU mailing list