Merge "fs_mgr: removing fs_mgr_read_fstab_with_dt()" into oc-dev (71de1368) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+6 −12

Original line number	Diff line number	Diff line
		@@ -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)

+0 −1

Original line number	Diff line number	Diff line
		@@ -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