diff mbox series

[OpenWrt-Devel,fstools,4/5] block: mount_device: skip extroot earlier

Message ID 20191029123950.40794-4-yszhou4tech@gmail.com
State Accepted
Delegated to: John Crispin
Headers show
Series [OpenWrt-Devel,fstools,1/5] block: umount: skip / unless -a is given | expand

Commit Message

Yousong Zhou Oct. 29, 2019, 12:39 p.m. UTC 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 block.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/block.c b/block.c
index 15caaba..084e7fc 100644
--- a/block.c
+++ b/block.c
@@ -1087,6 +1087,10 @@  static int mount_device(struct device *dev, int type)
 		return 0;
 	}
 
+	m = dev->m;
+	if (m && m->extroot)
+		return -1;
+
 	mp = find_mount_point(pr->dev);
 	if (mp && (type != TYPE_HOTPLUG)) {
 		ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
@@ -1094,10 +1098,6 @@  static int mount_device(struct device *dev, int type)
 		return -1;
 	}
 
-	m = dev->m;
-	if (m && m->extroot)
-		return -1;
-
 	if (type == TYPE_HOTPLUG)
 		blockd_notify(device, m, pr);