tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fs_mgr: don't log error messages when missing fstab"

Browse source 
am: ace69b2f7b

Change-Id: Ia5371dfd54467b94091f4aefc638a4f480bf707e
This commit is contained in:
Christopher Morin 2018-01-08 19:56:17 +00:00 committed by android-build-merger
commit e8493e7045
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/fs_mgr_fstab.cpp
View file

@ -638,6 +638,7 @@ err:
* frees up memory of the return value without touching a and b. */
static struct fstab *in_place_merge(struct fstab *a, struct fstab *b)
{
if (!a && !b) return nullptr;
if (!a) return b;
if (!b) return a;
@ -755,15 +756,17 @@ struct fstab *fs_mgr_read_fstab_default()
default_fstab = get_fstab_path();
}
if (default_fstab.empty()) {
LWARNING << __FUNCTION__ << "(): failed to find device default fstab";
struct fstab* fstab = nullptr;
if (!default_fstab.empty()) {
fstab = fs_mgr_read_fstab(default_fstab.c_str());
} else {
LINFO << __FUNCTION__ << "(): failed to find device default fstab";
}
struct fstab* fstab_dt = fs_mgr_read_fstab_dt();
// combines fstab entries passed in from device tree with
// the ones found from default_fstab file
struct fstab *fstab_dt = fs_mgr_read_fstab_dt();
struct fstab *fstab = fs_mgr_read_fstab(default_fstab.c_str());
return in_place_merge(fstab_dt, fstab);
}