X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=15d5f215303376c40a688f9c2dada51fdac2e591;hb=4a010f4e6e95964d7acaa33be768dbdb5e46d72a;hp=69cb6e24e4b23861b07ea8664de3c7befb889afa;hpb=bcbe497e5a73d889e8799f8a3680c303afede347;p=elogind.git

diff --git a/src/core/mount.c b/src/core/mount.c
index 69cb6e24e..15d5f2153 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -687,8 +687,10 @@ static void mount_set_state(Mount *m, MountState state) {
                  state == MOUNT_REMOUNTING_SIGKILL ||
                  state == MOUNT_UNMOUNTING_SIGTERM ||
                  state == MOUNT_UNMOUNTING_SIGKILL ||
-                 state == MOUNT_FAILED)
-                mount_notify_automount(m, -ENODEV);
+                 state == MOUNT_FAILED) {
+		if (state != old_state)
+			mount_notify_automount(m, -ENODEV);
+	}
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
@@ -1532,7 +1534,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
                         goto clean_up;
                 }
 
-                o = join(options, ",", options2, NULL);
+                o = strjoin(options, ",", options2, NULL);
                 if (!o) {
                         r = -ENOMEM;
                         goto finish;