block: simplify code picking mount target directory

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index b01a63307a360b729c399186d3524a09a6574630..0671aca6d0f8231ba9f790859b513ffd75735929 100644 (file)
--- a/block.c
+++ b/block.c
@@ -1021,36 +1021,37 @@ static int mount_device(struct probe_info *pr, int type)
        if (m && m->extroot)
                return -1;
 
-       if (m) switch (type) {
-       case TYPE_HOTPLUG:
+       if (type == TYPE_HOTPLUG)
                blockd_notify(device, m, pr);
-               if (m->autofs)
-                       return 0;
-               if (!auto_mount)
-                       return -1;
-               break;
-       case TYPE_AUTOFS:
-               if (!m->autofs)
-                       return -1;
-               break;
-       case TYPE_DEV:
-               if (m->autofs)
-                       return -1;
-               break;
-       } else if (type == TYPE_HOTPLUG) {
-               blockd_notify(device, NULL, pr);
-       }
 
        if (m) {
-               char *target = m->target;
                char _target[32];
+               char *target;
                int err = 0;
 
+               switch (type) {
+               case TYPE_HOTPLUG:
+                       if (m->autofs)
+                               return 0;
+                       if (!auto_mount)
+                               return -1;
+                       break;
+               case TYPE_AUTOFS:
+                       if (!m->autofs)
+                               return -1;
+                       break;
+               case TYPE_DEV:
+                       if (m->autofs)
+                               return -1;
+                       break;
+               }
+
                if (m->autofs) {
                        snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
                        target = _target;
-               }
-               if (!target) {
+               } else if (m->target) {
+                       target = m->target;
+               } else {
                        snprintf(_target, sizeof(_target), "/mnt/%s", device);
                        target = _target;
                }