From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 12 Feb 2018 11:01:53 +0000 (+0100)
Subject: mount: drop duplicated rmdir() call from the mount_enum_drives()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=04b897f8feaca344d4d6fbefc65f1cbd10743390;p=oweals%2Fmountd.git

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

Call to rmdir() for the same path is already executed in the
mount_dev_del().

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

diff --git a/mount.c b/mount.c
index aa346ff..bf5fbfd 100644
--- 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);
 			}