PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319

Browse Source 
am: fc0f970c93

Change-Id: I6c7065aeb42a4a9b4593e75ecfdb723c9971d37d
This commit is contained in:
Jaegeuk Kim
2018-04-04 14:01:54 -07:00
committed by android-build-merger
parent 08d3e83822 fc0f970c93
commit 21293778f3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+20 -5
View File
@@ -324,19 +324,34 @@ int format_volume(const char* volume, const char* directory) {
} }
// Has to be f2fs because we checked earlier. // Has to be f2fs because we checked earlier.
static constexpr int kSectorSize = 4096;
std::string cmd("/sbin/mkfs.f2fs"); std::string cmd("/sbin/mkfs.f2fs");
std::vector<std::string> make_f2fs_cmd = { cmd, "-d1", "-f", "-O", // clang-format off
"encrypt", "-O", "quota", v->blk_device }; std::vector<std::string> make_f2fs_cmd = {
if (length >= 512) { cmd,
make_f2fs_cmd.push_back(std::to_string(length / 512)); "-d1",
"-f",
"-O", "encrypt",
"-O", "quota",
"-w", std::to_string(kSectorSize),
v->blk_device,
};
// clang-format on
if (length >= kSectorSize) {
make_f2fs_cmd.push_back(std::to_string(length / kSectorSize));
} }
int result = exec_cmd(make_f2fs_cmd); int result = exec_cmd(make_f2fs_cmd);
if (result == 0 && directory != nullptr) { if (result == 0 && directory != nullptr) {
cmd = "/sbin/sload.f2fs"; cmd = "/sbin/sload.f2fs";
// clang-format off
std::vector<std::string> sload_f2fs_cmd = { std::vector<std::string> sload_f2fs_cmd = {
cmd, "-f", directory, "-t", volume, v->blk_device, cmd,
"-f", directory,
"-t", volume,
v->blk_device,
}; };
// clang-format on
result = exec_cmd(sload_f2fs_cmd); result = exec_cmd(sload_f2fs_cmd);
} }
if (result != 0) { if (result != 0) {