From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 Jul 2016 06:57:25 +0000 (+0200)
Subject: namespace: minor improvements
X-Git-Tag: v231~40^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3759%2Fhead;p=thirdparty%2Fsystemd.git

namespace: minor improvements

We generally try to avoid strerror(), due to its threads-unsafety, let's do
this here, too.

Also, let's be tiny bit more explanatory with the log messages, and let's
shorten a few things.
---

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 722538caf14..8df82c031c1 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -291,16 +291,15 @@ static int apply_mount(
                  * inaccessible path. */
                 umount_recursive(m->path, 0);
 
-                r = lstat(m->path, &target);
-                if (r != 0) {
+                if (lstat(m->path, &target) < 0) {
                         if (m->ignore && errno == ENOENT)
                                 return 0;
                         return -errno;
                 }
 
                 what = mode_to_inaccessible_node(target.st_mode);
-                if (what == NULL) {
-                        log_debug("File type not supported. Note that symlinks are not allowed");
+                if (!what) {
+                        log_debug("File type not supported for inaccessible mounts. Note that symlinks are not allowed");
                         return -ELOOP;
                 }
                 break;
@@ -331,12 +330,10 @@ static int apply_mount(
         if (r >= 0) {
                 log_debug("Successfully mounted %s to %s", what, m->path);
                 return r;
-        }
-        else {
+        } else {
                 if (m->ignore && errno == ENOENT)
                         return 0;
-                log_debug("Failed mounting %s to %s: %s", what, m->path, strerror(errno));
-                return -errno;
+                return log_debug_errno(errno, "Failed to mount %s to %s: %m", what, m->path);
         }
 }