From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Aug 2022 15:41:40 +0000 (+0000)
Subject: mount: Drop unused pakfire_umount_all function
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db7b68fad1443ce13417af44daf34c7231d3a0fd;p=people%2Fstevee%2Fpakfire.git

mount: Drop unused pakfire_umount_all function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/mount.h b/src/libpakfire/include/pakfire/mount.h
index f47184a6..fe9d3023 100644
--- a/src/libpakfire/include/pakfire/mount.h
+++ b/src/libpakfire/include/pakfire/mount.h
@@ -30,7 +30,6 @@ int pakfire_bind(struct pakfire* pakfire, const char* src, const char* dst, int
 int pakfire_mount_list(struct pakfire* pakfire);
 
 int pakfire_mount_all(struct pakfire* pakfire);
-int pakfire_umount_all(struct pakfire* pakfire);
 
 #endif /* PAKFIRE_PRIVATE */
 
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index b954c185..fafaa108 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -1484,12 +1484,6 @@ ERROR:
 	pakfire_jail_close_pipe(jail, ctx.pipes.log_ERROR);
 	pakfire_jail_close_pipe(jail, ctx.pipes.log_DEBUG);
 
-#if 0
-	// Umount everything
-	if (!pakfire_on_root(jail->pakfire))
-		pakfire_umount_all(jail->pakfire);
-#endif
-
 	return exit;
 }
 
diff --git a/src/libpakfire/mount.c b/src/libpakfire/mount.c
index 8b602d19..c2490589 100644
--- a/src/libpakfire/mount.c
+++ b/src/libpakfire/mount.c
@@ -215,27 +215,6 @@ static int pakfire_mount(struct pakfire* pakfire, const char* source, const char
 	return r;
 }
 
-static int pakfire_umount(struct pakfire* pakfire, const char* path, int flags) {
-	int r;
-
-	DEBUG(pakfire, "Umounting %s\n", path);
-
-RETRY:
-	// Perform umount
-	r = umount2(path, flags);
-	if (r) {
-		// Attempt a lazy umount when busy
-		if (errno == EBUSY) {
-			flags |= MNT_DETACH;
-			goto RETRY;
-		}
-
-		ERROR(pakfire, "Could not umount %s: %m\n", path);
-	}
-
-	return r;
-}
-
 static int __pakfire_mount_print(struct pakfire* pakfire,
 		struct libmnt_fs* fs, const void* data) {
 	DEBUG(pakfire,
@@ -403,23 +382,6 @@ RETRY:
 	return 0;
 }
 
-static int __pakfire_umount(struct pakfire* pakfire,
-		struct libmnt_fs* fs, const void* data) {
-	const char* target = mnt_fs_get_target(fs);
-	if (!target)
-		return 1;
-
-	return pakfire_umount(pakfire, target, 0);
-}
-
-/*
-	umounts everything that hasn't been umounted, yet
-*/
-int pakfire_umount_all(struct pakfire* pakfire) {
-	return pakfire_mount_foreach(pakfire, MNT_ITER_BACKWARD,
-		__pakfire_umount, NULL);
-}
-
 PAKFIRE_EXPORT int pakfire_bind(struct pakfire* pakfire, const char* src, const char* dst, int flags) {
 	struct stat st;
 	char mountpoint[PATH_MAX];