From: Harald Hoyer <harald@redhat.com>
Date: Tue, 9 Jun 2015 08:32:28 +0000 (+0200)
Subject: util:bind_remount_recursive(): handle return 0 of set_consume()
X-Git-Tag: v221~160^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85d834ae8e7d9e2c28ef8c1388e2913ed8fd0e3b;p=thirdparty%2Fsystemd.git

util:bind_remount_recursive(): handle return 0 of set_consume()

set_consume() does not return -EEXIST, but 0, in case the key is already
in the Set.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 311acbb3499..dc5e9387963 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4932,7 +4932,7 @@ int bind_remount_recursive(const char *prefix, bool ro) {
                 while ((x = set_steal_first(todo))) {
 
                         r = set_consume(done, x);
-                        if (r == -EEXIST)
+                        if (r == -EEXIST || r == 0)
                                 continue;
                         if (r < 0)
                                 return r;