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: removing fs_mgr_read_fstab_with_dt()"

This commit is contained in:
Treehugger Robot 2017-04-01 03:05:24 +00:00 committed by Gerrit Code Review
parent 145e185ddb acc1c3c792
commit 53108b269e
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs_mgr/fs_mgr_fstab.cpp
View File

@ -625,17 +625,6 @@ struct fstab *fs_mgr_read_fstab_dt()
return fstab;
}
/* combines fstab entries passed in from device tree with
* the ones found from fstab_path
*/
struct fstab *fs_mgr_read_fstab_with_dt(const char *fstab_path)
{
struct fstab *fstab_dt = fs_mgr_read_fstab_dt();
struct fstab *fstab = fs_mgr_read_fstab(fstab_path);
return in_place_merge(fstab_dt, fstab);
}
/*
* tries to load default fstab.<hardware> file from /odm/etc, /vendor/etc
* or /. loads the first one found and also combines fstab entries passed
@ -658,7 +647,12 @@ struct fstab *fs_mgr_read_fstab_default()
LWARNING << __FUNCTION__ << "(): failed to find device hardware name";
}
return fs_mgr_read_fstab_with_dt(default_fstab.c_str());
// 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);
}
void fs_mgr_free_fstab(struct fstab *fstab)

1
fs_mgr/include/fs_mgr.h
View File

@ -88,7 +88,6 @@ typedef void (*fs_mgr_verity_state_callback)(struct fstab_rec *fstab,
struct fstab *fs_mgr_read_fstab_default();
struct fstab *fs_mgr_read_fstab_dt();
struct fstab *fs_mgr_read_fstab(const char *fstab_path);
struct fstab *fs_mgr_read_fstab_with_dt(const char *fstab_path);
void fs_mgr_free_fstab(struct fstab *fstab);
#define FS_MGR_MNTALL_DEV_FILE_ENCRYPTED 5