From 03482f69a2af865e282bb26de947f0df1995d559 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 29 Sep 2014 12:46:47 +0400 Subject: [PATCH] img: Keep the copy of flags value in open_image_at 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 Acked-by: Cyrill Gorcunov --- image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image.c b/image.c index 566073bc8..bc2d69d66 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;