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 "Make remount into checkpointing for ext4 userdata a no-op" am: dbee3618be am: 770d11fa2d 

am: 34914680e9

Change-Id: I5dfc9348d2e67493cc0b039e15ed05590c83790b
This commit is contained in:
Nikita Ioffe 2019-11-06 19:19:29 -08:00 committed by android-build-merger
parent 7c0a6f640c 34914680e9
commit f630d552e7
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs_mgr/fs_mgr.cpp
View File

@ -1407,9 +1407,8 @@ int fs_mgr_remount_userdata_into_checkpointing(Fstab* fstab) {
return -1;
}
} else {
// TODO(b/135984674): support remounting for ext4.
LERROR << "Remounting in checkpointing mode is not yet supported for ext4";
return -1;
// STOPSHIP(b/143970043): support remounting for ext4.
LWARNING << "Remounting into checkpointing is not supported for ex4. Proceed with caution";
}
return 0;
}

19
init/reboot.cpp
View File

@ -746,23 +746,8 @@ static Result<void> DoUserspaceReboot() {
// TODO(b/135984674): store information about offending services for debugging.
return Error() << r << " post-data services are still running";
}
// We only really need to restart vold if userdata is ext4 filesystem.
// TODO(b/135984674): get userdata fs type here, and do nothing in case of f2fs.
// First shutdown volumes managed by vold. They will be recreated by
// system_server.
Service* vold_service = ServiceList::GetInstance().FindService("vold");
if (vold_service != nullptr && vold_service->IsRunning()) {
if (auto result = ShutdownVold(); !result) {
return result;
}
LOG(INFO) << "Restarting vold";
vold_service->Restart();
}
// Again, we only need to kill zram backing device in case of ext4 userdata.
// TODO(b/135984674): get userdata fs type here, and do nothing in case of f2fs.
if (auto result = KillZramBackingDevice(); !result) {
return result;
}
// TODO(b/143970043): in case of ext4 we probably we will need to restart vold and kill zram
// backing device.
if (int r = StopServicesAndLogViolations(GetDebuggingServices(true /* only_post_data */), 5s,
false /* SIGKILL */);
r > 0) {

2
rootdir/init.rc
View File

@ -924,7 +924,7 @@ on userspace-reboot-requested
setprop sys.init.userspace_reboot_in_progress 1
setprop sys.boot_completed 0
setprop sys.init.updatable_crashing 0
setprop apexd.status 0
setprop apexd.status ""
on userspace-reboot-fs-remount
# Make sure that vold is running.