Add unmountTree to utils.
Bug: 111890351
Test: builds without any errors
Change-Id: I62a94c9e8d101756b686b402774f08a1d71cf875
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 53380af..db47e4d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -411,30 +411,7 @@
}
static int unmount_tree(const std::string& prefix) {
- FILE* fp = setmntent("/proc/mounts", "r");
- if (fp == NULL) {
- PLOG(ERROR) << "Failed to open /proc/mounts";
- return -errno;
- }
-
- // Some volumes can be stacked on each other, so force unmount in
- // reverse order to give us the best chance of success.
- std::list<std::string> toUnmount;
- mntent* mentry;
- while ((mentry = getmntent(fp)) != NULL) {
- auto test = std::string(mentry->mnt_dir) + "/";
- if (android::base::StartsWith(test, prefix)) {
- toUnmount.push_front(test);
- }
- }
- endmntent(fp);
-
- for (const auto& path : toUnmount) {
- if (umount2(path.c_str(), MNT_DETACH)) {
- PLOG(ERROR) << "Failed to unmount " << path;
- }
- }
- return 0;
+ return android::vold::UnmountTree(prefix);
}
int VolumeManager::remountUid(uid_t uid, const std::string& mode) {