diff options
author | Jaegeuk Kim <jaegeuk@google.com> | 2018-04-04 23:12:25 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 23:12:25 +0200 |
commit | d0e256b34362fece0a3cce8f94842cf7efd62854 (patch) | |
tree | 4bb9ebb578badaafb32363d462fc8fb4dcb45f5e | |
parent | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4 (diff) | |
parent | Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319 (diff) | |
download | android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar.gz android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar.bz2 android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar.lz android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar.xz android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.tar.zst android_bootable_recovery-d0e256b34362fece0a3cce8f94842cf7efd62854.zip |
-rw-r--r-- | roots.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
@@ -324,19 +324,34 @@ int format_volume(const char* volume, const char* directory) { } // Has to be f2fs because we checked earlier. + static constexpr int kSectorSize = 4096; std::string cmd("/sbin/mkfs.f2fs"); - std::vector<std::string> make_f2fs_cmd = { cmd, "-d1", "-f", "-O", - "encrypt", "-O", "quota", v->blk_device }; - if (length >= 512) { - make_f2fs_cmd.push_back(std::to_string(length / 512)); + // clang-format off + std::vector<std::string> make_f2fs_cmd = { + cmd, + "-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); if (result == 0 && directory != nullptr) { cmd = "/sbin/sload.f2fs"; + // clang-format off 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); } if (result != 0) { |