From 546dbec532b49ddb649d364c7b9e9e91d7b377f0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Nov 2016 23:31:01 +0100
Subject: [PATCH] shared: make sure image_path_lock() return parameters are
 always initialized on success

We forgot to initialize the "global" return parameter in one case. Fix that.
---
 src/shared/machine-image.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 6414ba5..af102e3 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <linux/fs.h>
+
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "chattr-util.h"
@@ -37,8 +38,8 @@
 #include "hashmap.h"
 #include "lockfile-util.h"
 #include "log.h"
-#include "macro.h"
 #include "machine-image.h"
+#include "macro.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "rm-rf.h"
@@ -746,7 +747,8 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
                         release_lock_file(&t);
                         return r;
                 }
-        }
+        } else
+                *global = (LockFile) LOCK_FILE_INIT;
 
         *local = t;
         return 0;
-- 
2.7.4