mkfs.f2fs: specify sector size for target image size
The total sectors that we want to format is used in different meanings from various users. This notifies its size based on 4096 bytes explicitly. Bug: 76407663 Change-Id: I3392646648264ad1ca78e4b87240edc9385a0cc4 Merged-In: I3392646648264ad1ca78e4b87240edc9385a0cc4 Reported-by: katao@xiaomi.com Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
This commit is contained in:
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user