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

Merge "Revert^4 "Set block device as RO/RW before mount"" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-11-01 20:38:40 +00:00 • committed by Gerrit Code Review
commit 65ebd83d9c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr.cpp
View file

@ -822,6 +822,9 @@ static int __mount(const std::string& source, const std::string& target, const F
if (read_only) {
mountflags |= MS_RDONLY;
}
if (!fs_mgr_set_blk_ro(source, read_only)) {
PLOG(ERROR) << "Failed to set " << source << " as " << (read_only ? "RO" : "RW");
}
int ret = 0;
int save_errno = 0;
int gc_allowance = 0;
@ -876,9 +879,6 @@ static int __mount(const std::string& source, const std::string& target, const F
}
PINFO << __FUNCTION__ << "(source=" << source << source_missing << ",target=" << target
<< target_missing << ",type=" << entry.fs_type << ")=" << ret;
if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {
fs_mgr_set_blk_ro(source);
}
if (ret == 0) {
android::base::SetProperty("ro.boottime.init.mount." + Basename(target),
std::to_string(t.duration().count()));