mount: drop duplicated rmdir() call from the mount_enum_drives()

[project/mountd.git] / mount.c

diff --git a/mount.c b/mount.c
index cb3e03c..bf5fbfd 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -325,7 +325,7 @@ int mount_remove(char *path, char *dev)
        char tmp[256];
        int ret;
        snprintf(tmp, 256, "%s%s", path, dev);
-       log_printf("%s has expired... unmounting\n", tmp);
+       log_printf("device %s has expired... unmounting %s\n", dev, tmp);
        ret = system_printf("/bin/umount %s", tmp);
        if(ret != 0)
                return 0;
@@ -587,13 +587,10 @@ static void mount_dev_del(struct mount *mount)
        char tmp[256];
 
        if (mount->status == STATUS_MOUNTED) {
-               snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->name);
-               log_printf("%s has dissappeared ... unmounting\n", tmp);
                snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->dev);
+               log_printf("device %s has disappeared ... unmounting %s\n", mount->dev, tmp);
                system_printf("/bin/umount %s", tmp);
                rmdir(tmp);
-               snprintf(tmp, 64, "%s%s", uci_path, mount->name);
-               unlink(tmp);
                mount_dump_uci_state();
        }
 }
@@ -763,11 +760,9 @@ static void mount_enum_drives(void)
                        p->prev->next = p->next;
                        p->next->prev = p->prev;
                        p = p->next;
-                       log_printf("removing %s\n", q->dev);
                        if (q->status == STATUS_MOUNTED || q->status == STATUS_EXPIRED) {
-                               snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev);
-                               rmdir(tmp);
                                snprintf(tmp, 64, "%s%s", uci_path, q->name);
+                               log_printf("unlinking %s\n", tmp);
                                unlink(tmp);
                                system_printf("ACTION=remove DEVICE=%s NAME=%s /sbin/hotplug-call mount", q->dev, q->name);
                        }