From 1af9ca2c14f6c65f23244ff7562e069c51326dd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 9 Feb 2018 16:21:49 +0100 Subject: [PATCH] mount: change mount_dev_del() argument to struct mount * MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Caller of mount_dev_del() already has struct mount * so there is no point in passing matchin device and then looking for struct mount * again. Signed-off-by: Rafał Miłecki --- mount.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mount.c b/mount.c index f995745..646cc30 100644 --- a/mount.c +++ b/mount.c @@ -567,23 +567,19 @@ static void mount_dev_add(char *dev) } } -static void mount_dev_del(char *dev) +static void mount_dev_del(struct mount *mount) { - struct mount *mount = mount_find(0, dev); char tmp[256]; - if(mount) - { - if(mount->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); - system_printf("/bin/umount %s", tmp); - rmdir(tmp); - snprintf(tmp, 64, "%s%s", uci_path, mount->name); - unlink(tmp); - mount_dump_uci_state(); - } + + if (mount->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); + system_printf("/bin/umount %s", tmp); + rmdir(tmp); + snprintf(tmp, 64, "%s%s", uci_path, mount->name); + unlink(tmp); + mount_dump_uci_state(); } } @@ -748,7 +744,7 @@ static void mount_enum_drives(void) } if(!check_block(q->dev)||del) { - mount_dev_del(q->dev); + mount_dev_del(q); p->prev->next = p->next; p->next->prev = p->prev; p = p->next; -- 2.11.0