diff options
| author | Rafał Miłecki | 2018-02-09 15:21:49 +0000 |
|---|---|---|
| committer | Rafał Miłecki | 2018-02-12 09:52:16 +0000 |
| commit | 1af9ca2c14f6c65f23244ff7562e069c51326dd8 (patch) | |
| tree | 159f313f14c4150d12078e0ae9e4099d8e85fc0e | |
| parent | 7c8fea849d5a59485daea527106e29e4db0f989b (diff) | |
| download | mountd-1af9ca2c14f6c65f23244ff7562e069c51326dd8.tar.gz | |
mount: change mount_dev_del() argument to struct mount *
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 <rafal@milecki.pl>
| -rw-r--r-- | mount.c | 28 |
1 files changed, 12 insertions, 16 deletions
@@ -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; |