From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Tue, 29 Oct 2019 12:39:49 +0000 (+0000)
Subject: block: mount_device: skip extroot earlier
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da4edc12ec9b647331a7491e3dbb963b453645da;p=oweals%2Ffstools.git

block: mount_device: skip extroot earlier

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---

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);