openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "init/reboot: call MNT_FORCE at the last umount(2)" 

am: 4e008547be

Change-Id: Ief5e62e385cf83198ad3c9de65131dace0a7c4ae
This commit is contained in:
Jaegeuk Kim 2017-10-05 20:38:10 +00:00 committed by android-build-merger
parent ebef33b85a 4e008547be
commit eacc9cd637
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init/reboot.cpp
View File

@ -86,8 +86,8 @@ class MountEntry {
mnt_type_(entry.mnt_type),
mnt_opts_(entry.mnt_opts) {}
bool Umount() {
int r = umount2(mnt_dir_.c_str(), 0);
bool Umount(bool force) {
int r = umount2(mnt_dir_.c_str(), force ? MNT_FORCE : 0);
if (r == 0) {
LOG(INFO) << "umounted " << mnt_fsname_ << ":" << mnt_dir_ << " opts " << mnt_opts_;
return true;
@ -280,14 +280,15 @@ static UmountStat UmountPartitions(std::chrono::milliseconds timeout) {
bool unmount_done = true;
if (emulated_devices.size() > 0) {
unmount_done = std::all_of(emulated_devices.begin(), emulated_devices.end(),
[](auto& entry) { return entry.Umount(); });
[](auto& entry) { return entry.Umount(false); });
if (unmount_done) {
sync();
}
}
unmount_done = std::all_of(block_devices.begin(), block_devices.end(),
[](auto& entry) { return entry.Umount(); }) &&
unmount_done;
unmount_done =
std::all_of(block_devices.begin(), block_devices.end(),
[&timeout](auto& entry) { return entry.Umount(timeout == 0ms); }) &&
unmount_done;
if (unmount_done) {
return UMOUNT_STAT_SUCCESS;
}