Merge changes from topic "sload_f2fs" (ec870745) · Commits · e / os / android_system_core

fastboot/Android.mk

+2 −1

fastboot/fs.cpp

+24 −22

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ using android::base::StringPrintf;
	using android::base::unique_fd;		using android::base::unique_fd;

	#ifdef WIN32		#ifdef WIN32
	static int exec_e2fs_cmd(const char* /path/, const char argv, const char envp) {		static int exec_cmd(const char* path, const char argv, const char envp) {
	std::string cmd;		std::string cmd;
	int i = 0;		int i = 0;
	while (argv[i] != nullptr) {		while (argv[i] != nullptr) {
	@@ -76,10 +76,14 @@ static int exec_e2fs_cmd(const char* /path/, const char argv, const char e
	CloseHandle(pi.hProcess);		CloseHandle(pi.hProcess);
	CloseHandle(pi.hThread);		CloseHandle(pi.hThread);

	return exit_code != 0;		if (exit_code != 0) {
			fprintf(stderr, "%s failed: %lu\n", path, exit_code);
			return -1;
			}
			return 0;
	}		}
	#else		#else
	static int exec_e2fs_cmd(const char* path, const char argv, const char envp) {		static int exec_cmd(const char* path, const char argv, const char envp) {
	int status;		int status;
	pid_t child;		pid_t child;
	if ((child = fork()) == 0) {		if ((child = fork()) == 0) {
	@@ -97,11 +101,13 @@ static int exec_e2fs_cmd(const char* path, const char argv, const char envp)
	int ret = -1;		int ret = -1;
	if (WIFEXITED(status)) {		if (WIFEXITED(status)) {
	ret = WEXITSTATUS(status);		ret = WEXITSTATUS(status);
			}

	if (ret != 0) {		if (ret != 0) {
	fprintf(stderr, "%s failed with status %d\n", path, ret);		fprintf(stderr, "%s failed with status %d\n", path, ret);
			return -1;
	}		}
	}		return 0;
	return ret;
	}		}
	#endif		#endif

	@@ -140,9 +146,8 @@ static int generate_ext4_image(const char* fileName, long long partSize,
	const std::string mke2fs_env = "MKE2FS_CONFIG=" + GetExecutableDirectory() + "/mke2fs.conf";		const std::string mke2fs_env = "MKE2FS_CONFIG=" + GetExecutableDirectory() + "/mke2fs.conf";
	std::vector<const char*> mke2fs_envp = {mke2fs_env.c_str(), nullptr};		std::vector<const char*> mke2fs_envp = {mke2fs_env.c_str(), nullptr};

	int ret = exec_e2fs_cmd(mke2fs_args[0], mke2fs_args.data(), mke2fs_envp.data());		int ret = exec_cmd(mke2fs_args[0], mke2fs_args.data(), mke2fs_envp.data());
	if (ret != 0) {		if (ret != 0) {
	fprintf(stderr, "mke2fs failed: %d\n", ret);
	return -1;		return -1;
	}		}

	@@ -154,13 +159,7 @@ static int generate_ext4_image(const char* fileName, long long partSize,
	std::vector<const char*> e2fsdroid_args = {e2fsdroid_path.c_str(), "-f", initial_dir.c_str(),		std::vector<const char*> e2fsdroid_args = {e2fsdroid_path.c_str(), "-f", initial_dir.c_str(),
	fileName, nullptr};		fileName, nullptr};

	ret = exec_e2fs_cmd(e2fsdroid_args[0], e2fsdroid_args.data(), nullptr);		return exec_cmd(e2fsdroid_args[0], e2fsdroid_args.data(), nullptr);
	if (ret != 0) {
	fprintf(stderr, "e2fsdroid failed: %d\n", ret);
	return -1;
	}

	return 0;
	}		}

	static int generate_f2fs_image(const char* fileName, long long partSize, const std::string& initial_dir,		static int generate_f2fs_image(const char* fileName, long long partSize, const std::string& initial_dir,
	@@ -182,20 +181,23 @@ static int generate_f2fs_image(const char* fileName, long long partSize, const s
	mkf2fs_args.push_back(fileName);		mkf2fs_args.push_back(fileName);
	mkf2fs_args.push_back(nullptr);		mkf2fs_args.push_back(nullptr);

	int ret = exec_e2fs_cmd(mkf2fs_args[0], mkf2fs_args.data(), nullptr);		int ret = exec_cmd(mkf2fs_args[0], mkf2fs_args.data(), nullptr);
	if (ret != 0) {		if (ret != 0) {
	fprintf(stderr, "mkf2fs failed: %d\n", ret);
	return -1;		return -1;
	}		}

	if (!initial_dir.empty()) {		if (initial_dir.empty()) {
	fprintf(stderr, "sload.f2s not supported yet\n");
	return 0;		return 0;
	}		}
	return 0;
			const std::string sload_path = exec_dir + "/sload_f2fs";
			std::vector<const char*> sload_args = {sload_path.c_str(), "-S",
			"-f", initial_dir.c_str(), fileName, nullptr};

			return exec_cmd(sload_args[0], sload_args.data(), nullptr);
	#else		#else
	UNUSED(fileName, partSize, initial_dir);		UNUSED(fileName, partSize, initial_dir);
	fprintf(stderr, "make_f2fs not supported on Windows\n");		fprintf(stderr, "generate_f2fs_image: Not supported on Windows\n");
	return -1;		return -1;
	#endif		#endif
	}		}

fs_mgr/fs_mgr_format.cpp

+36 −8

Original line number	Original line	Diff line number	Diff line
	@@ -34,23 +34,35 @@
	#include "fs_mgr_priv.h"		#include "fs_mgr_priv.h"
	#include "cryptfs.h"		#include "cryptfs.h"

	static int format_ext4(char fs_blkdev, char fs_mnt_point, bool crypt_footer)		static int get_dev_sz(char fs_blkdev, uint64_t dev_sz)
	{		{
	uint64_t dev_sz;		int fd;
	int fd, rc = 0;

	if ((fd = open(fs_blkdev, O_WRONLY)) < 0) {		if ((fd = open(fs_blkdev, O_RDONLY)) < 0) {
	PERROR << "Cannot open block device";		PERROR << "Cannot open block device";
	return -1;		return -1;
	}		}

	if ((ioctl(fd, BLKGETSIZE64, &dev_sz)) == -1) {		if ((ioctl(fd, BLKGETSIZE64, dev_sz)) == -1) {
	PERROR << "Cannot get block device size";		PERROR << "Cannot get block device size";
	close(fd);		close(fd);
	return -1;		return -1;
	}		}

	close(fd);		close(fd);
			return 0;
			}

			static int format_ext4(char fs_blkdev, char fs_mnt_point, bool crypt_footer)
			{
			uint64_t dev_sz;
			int rc = 0;
			int status;

			rc = get_dev_sz(fs_blkdev, &dev_sz);
			if (rc) {
			return rc;
			}

	/* Format the partition using the calculated length */		/* Format the partition using the calculated length */
	if (crypt_footer) {		if (crypt_footer) {
	@@ -85,9 +97,25 @@ static int format_ext4(char fs_blkdev, char fs_mnt_point, bool crypt_footer)
	return rc;		return rc;
	}		}

	static int format_f2fs(char *fs_blkdev)		static int format_f2fs(char *fs_blkdev, uint64_t dev_sz, bool crypt_footer)
	{		{
	const char* const args[] = {"/system/bin/make_f2fs", "-f", "-O encrypt", fs_blkdev, nullptr};		int status;

			if (!dev_sz) {
			int rc = get_dev_sz(fs_blkdev, &dev_sz);
			if (rc) {
			return rc;
			}
			}

			/* Format the partition using the calculated length */
			if (crypt_footer) {
			dev_sz -= CRYPT_FOOTER_OFFSET;
			}

			std::string size_str = std::to_string(dev_sz / 4096);
			const char* const args[] = {
			"/system/bin/make_f2fs", "-f", "-O", "encrypt", fs_blkdev, size_str.c_str(), nullptr};

	return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), NULL, true,		return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), NULL, true,
	LOG_KLOG, true, nullptr, nullptr, 0);		LOG_KLOG, true, nullptr, nullptr, 0);
	@@ -101,7 +129,7 @@ int fs_mgr_do_format(struct fstab_rec *fstab, bool crypt_footer)
	<< " as '" << fstab->fs_type << "'";		<< " as '" << fstab->fs_type << "'";

	if (!strncmp(fstab->fs_type, "f2fs", 4)) {		if (!strncmp(fstab->fs_type, "f2fs", 4)) {
	rc = format_f2fs(fstab->blk_device);		rc = format_f2fs(fstab->blk_device, fstab->length, crypt_footer);
	} else if (!strncmp(fstab->fs_type, "ext4", 4)) {		} else if (!strncmp(fstab->fs_type, "ext4", 4)) {
	rc = format_ext4(fstab->blk_device, fstab->mount_point, crypt_footer);		rc = format_ext4(fstab->blk_device, fstab->mount_point, crypt_footer);
	} else {		} else {

init/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,8 @@ cc_binary {
	required: [		required: [
	"e2fsdroid",		"e2fsdroid",
	"mke2fs",		"mke2fs",
			"sload_f2fs",
			"make_f2fs",
	],		],
	static_executable: true,		static_executable: true,
	srcs: [		srcs: [

init/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,8 @@ LOCAL_STATIC_LIBRARIES := \
	LOCAL_REQUIRED_MODULES := \		LOCAL_REQUIRED_MODULES := \
	e2fsdroid \		e2fsdroid \
	mke2fs \		mke2fs \
			sload_f2fs \
			make_f2fs \

	# Create symlinks.		# Create symlinks.
	LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \		LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ LOCAL_MODULE := fastboot
	LOCAL_MODULE_TAGS := debug		LOCAL_MODULE_TAGS := debug
	LOCAL_MODULE_HOST_OS := darwin linux windows		LOCAL_MODULE_HOST_OS := darwin linux windows
	LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code		LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code
	LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid mke2fs.conf make_f2fs		LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid mke2fs.conf make_f2fs sload_f2fs

	LOCAL_SRC_FILES_linux := usb_linux.cpp		LOCAL_SRC_FILES_linux := usb_linux.cpp
	LOCAL_STATIC_LIBRARIES_linux := libselinux		LOCAL_STATIC_LIBRARIES_linux := libselinux
	@@ -79,6 +79,7 @@ my_dist_files := $(LOCAL_BUILT_MODULE)
	my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)		my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)
	my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid$(HOST_EXECUTABLE_SUFFIX)		my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid$(HOST_EXECUTABLE_SUFFIX)
	my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)		my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)
			my_dist_files += $(HOST_OUT_EXECUTABLES)/sload_f2fs$(HOST_EXECUTABLE_SUFFIX)
	$(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files))		$(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files))
	ifdef HOST_CROSS_OS		ifdef HOST_CROSS_OS
	# Archive fastboot.exe for win_sdk build.		# Archive fastboot.exe for win_sdk build.