ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
The last one will avoid errors=panic in ext4.

Test: Build
Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
This commit is contained in:
Jaegeuk Kim 2017-09-25 10:55:39 -07:00 • committed by Wei Wang
parent 142303b9d9
commit 0f04f72c2d
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;
}