mount: drop duplicated rmdir() call from the mount_enum_drives()
authorRafał Miłecki <rafal@milecki.pl>
Mon, 12 Feb 2018 11:01:53 +0000 (12:01 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Fri, 16 Feb 2018 09:55:36 +0000 (10:55 +0100)
Call to rmdir() for the same path is already executed in the
mount_dev_del().

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
mount.c

diff --git a/mount.c b/mount.c
index aa346fff96abac9da6da8766e3f4767ab06e505b..bf5fbfdd2fdeaba22b6f6e1aee49b29bdb63c35c 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -760,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);
                        }