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 "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging"

This commit is contained in:
Treehugger Robot 2019-01-26 03:47:49 +00:00 committed by Gerrit Code Review
parent 79f60a9bab f98d6c49e0
commit 33cff00c1c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs_mgr/fs_mgr_fstab.cpp
View File

@ -720,10 +720,10 @@ struct fstab* fs_mgr_read_fstab(const char* fstab_path) {
}
// Returns fstab entries parsed from the device tree if they exist
bool ReadFstabFromDt(Fstab* fstab) {
bool ReadFstabFromDt(Fstab* fstab, bool log) {
std::string fstab_buf = read_fstab_from_dt();
if (fstab_buf.empty()) {
LINFO << __FUNCTION__ << "(): failed to read fstab from dt";
if (log) LINFO << __FUNCTION__ << "(): failed to read fstab from dt";
return false;
}
@ -731,13 +731,15 @@ bool ReadFstabFromDt(Fstab* fstab) {
fmemopen(static_cast<void*>(const_cast<char*>(fstab_buf.c_str())),
fstab_buf.length(), "r"), fclose);
if (!fstab_file) {
PERROR << __FUNCTION__ << "(): failed to create a file stream for fstab dt";
if (log) PERROR << __FUNCTION__ << "(): failed to create a file stream for fstab dt";
return false;
}
if (!fs_mgr_read_fstab_file(fstab_file.get(), false, fstab)) {
LERROR << __FUNCTION__ << "(): failed to load fstab from kernel:"
<< std::endl << fstab_buf;
if (log) {
LERROR << __FUNCTION__ << "(): failed to load fstab from kernel:" << std::endl
<< fstab_buf;
}
return false;
}
@ -779,7 +781,7 @@ static std::string get_fstab_path()
// Loads the fstab file and combines with fstab entries passed in from device tree.
bool ReadDefaultFstab(Fstab* fstab) {
Fstab dt_fstab;
ReadFstabFromDt(&dt_fstab);
ReadFstabFromDt(&dt_fstab, false);
*fstab = std::move(dt_fstab);

2
fs_mgr/include_fstab/fstab/fstab.h
View File

@ -192,7 +192,7 @@ struct FstabEntry {
using Fstab = std::vector<FstabEntry>;
bool ReadFstabFromFile(const std::string& path, Fstab* fstab);
bool ReadFstabFromDt(Fstab* fstab);
bool ReadFstabFromDt(Fstab* fstab, bool log = true);
bool ReadDefaultFstab(Fstab* fstab);
// Temporary conversion functions.