dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

namespace: minor improvements

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2016-07-20 08:57:25 +02:00
parent d724118e20
commit 5fd7cf6fe2
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/namespace.c
View File

@@ -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);
}
}