time-util: when formatting usec_t as raw integers use PRIu64

[elogind.git] / src / basic / mount-util.c

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 61190e40ac15f51a70f8d6fa0b45af28f9492052..402e55bcff500dea177a1062df357dec6528fe20 100644 (file)
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -674,6 +674,9 @@ int mount_verbose(
         else if ((flags & MS_BIND) && !type)
                 log_debug("Bind-mounting %s on %s (%s \"%s\")...",
                           what, where, strnull(fl), strempty(options));
+        else if (flags & MS_MOVE)
+                log_debug("Moving mount %s → %s (%s \"%s\")...",
+                          what, where, strnull(fl), strempty(options));
         else
                 log_debug("Mounting %s on %s (%s \"%s\")...",
                           strna(type), where, strnull(fl), strempty(options));
@@ -695,13 +698,12 @@ int umount_verbose(const char *what) {
 const char *mount_propagation_flags_to_string(unsigned long flags) {
 
         switch (flags & (MS_SHARED|MS_SLAVE|MS_PRIVATE)) {
-
+        case 0:
+                return "";
         case MS_SHARED:
                 return "shared";
-
         case MS_SLAVE:
                 return "slave";
-
         case MS_PRIVATE:
                 return "private";
         }
@@ -709,17 +711,18 @@ const char *mount_propagation_flags_to_string(unsigned long flags) {
         return NULL;
 }
 
-unsigned long mount_propagation_flags_from_string(const char *name) {
 
-        if (isempty(name))
-                return 0;
-
-        if (streq(name, "shared"))
-                return MS_SHARED;
-        if (streq(name, "slave"))
-                return MS_SLAVE;
-        if (streq(name, "private"))
-                return MS_PRIVATE;
+int mount_propagation_flags_from_string(const char *name, unsigned long *ret) {
 
+        if (isempty(name))
+                *ret = 0;
+        else if (streq(name, "shared"))
+                *ret = MS_SHARED;
+        else if (streq(name, "slave"))
+                *ret = MS_SLAVE;
+        else if (streq(name, "private"))
+                *ret = MS_PRIVATE;
+        else
+                return -EINVAL;
         return 0;
 }