tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do lazy-unmount to /storage directly"

Browse source 
am: 53b0d95903

Change-Id: Id43d707386950c50d6dc1e01970223cd2e5b0763
This commit is contained in:
Paul Crowley 2018-12-06 22:58:59 -08:00 committed by android-build-merger
commit fbc24b5c8f
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Utils.cpp
View file

@ -751,29 +751,10 @@ bool IsRunningInEmulator() {
}
status_t UnmountTree(const std::string& prefix) {
FILE* fp = setmntent("/proc/mounts", "re");
if (fp == NULL) {
PLOG(ERROR) << "Failed to open /proc/mounts";
if (umount2(prefix.c_str(), MNT_DETACH)) {
PLOG(ERROR) << "Failed to unmount " << prefix;
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 OK;
}