diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-04 05:36:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-04 05:36:53 +0000 |
| commit | 8427357b51bf3ec075d8baefc871713ea30aed3d (patch) | |
| tree | 9e87a4017d95f7b985ffe0fb385bf4fb0be1e831 | |
| parent | 242c11c6648a744a1321d8e360ff953bdddf183c (diff) | |
| parent | 308b1552ff2792e376870953117d8985624210fc (diff) | |
Merge "fs_mgr: removing fs_mgr_read_fstab_with_dt()" into oc-dev
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 18 | ||||
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 1 |
2 files changed, 6 insertions, 13 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 70b10e0439..a9a0df79ef 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -671,17 +671,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 @@ -704,7 +693,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) diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index e5f26998c4..2fd5f65a48 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -89,7 +89,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 |