Merge "fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&" am: 1206850289 (7119142d) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_overlayfs.cpp

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,10 +61,18 @@ bool fs_mgr_overlayfs_mount_all(fstab*) {
	return false;		return false;
	}		}

			bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>&) {
			return false;
			}

	std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab*) {		std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab*) {
	return {};		return {};
	}		}

			std::vector<std::string> fs_mgr_overlayfs_required_devices(const std::vector<const fstab_rec*>&) {
			return {};
			}

	bool fs_mgr_overlayfs_setup(const char, const char, bool* change) {		bool fs_mgr_overlayfs_setup(const char, const char, bool* change) {
	if (change) *change = false;		if (change) *change = false;
	return false;		return false;
	@@ -764,6 +772,13 @@ bool fs_mgr_overlayfs_mount_all(fstab* fstab) {
	return ret;		return ret;
	}		}

			bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fsrecs) {
			std::vector<fstab_rec> recs;
			for (const auto& rec : fsrecs) recs.push_back(*rec);
			fstab fstab = {static_cast<int>(fsrecs.size()), &recs[0]};
			return fs_mgr_overlayfs_mount_all(&fstab);
			}

	std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {		std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
	if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {		if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {
	return {};		return {};
	@@ -778,6 +793,14 @@ std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
	return {};		return {};
	}		}

			std::vector<std::string> fs_mgr_overlayfs_required_devices(
			const std::vector<const fstab_rec*>& fsrecs) {
			std::vector<fstab_rec> recs;
			for (const auto& rec : fsrecs) recs.push_back(*rec);
			fstab fstab = {static_cast<int>(fsrecs.size()), &recs[0]};
			return fs_mgr_overlayfs_required_devices(&fstab);
			}

	// Returns false if setup not permitted, errno set to last error.		// Returns false if setup not permitted, errno set to last error.
	// If something is altered, set *change.		// If something is altered, set *change.
	bool fs_mgr_overlayfs_setup(const char* backing, const char* mount_point, bool* change) {		bool fs_mgr_overlayfs_setup(const char* backing, const char* mount_point, bool* change) {

fs_mgr/include/fs_mgr_overlayfs.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,10 @@
	#include <vector>		#include <vector>

	bool fs_mgr_overlayfs_mount_all(fstab* fstab);		bool fs_mgr_overlayfs_mount_all(fstab* fstab);
			bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fstab);
	std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab);		std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab);
			std::vector<std::string> fs_mgr_overlayfs_required_devices(
			const std::vector<const fstab_rec*>& fstab);
	bool fs_mgr_overlayfs_setup(const char* backing = nullptr, const char* mount_point = nullptr,		bool fs_mgr_overlayfs_setup(const char* backing = nullptr, const char* mount_point = nullptr,
	bool* change = nullptr);		bool* change = nullptr);
	bool fs_mgr_overlayfs_teardown(const char* mount_point = nullptr, bool* change = nullptr);		bool fs_mgr_overlayfs_teardown(const char* mount_point = nullptr, bool* change = nullptr);