summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2023-12-01 23:42:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-01 23:42:46 +0000
commit72035b3638aad67d049e375d2a0f4dc7f7291ef4 (patch)
treec6e3ef6c3da851d051b752c6f60dde3ff355a34f
parenta68eb936befcfab58ecdbda5dbe0684d7acbcabd (diff)
parent22139449863c9a7af47cab0a6706526e82f7ad30 (diff)
downloadvold-72035b3638aad67d049e375d2a0f4dc7f7291ef4.tar.gz
Merge "Add support for 16k F2FS" into main am: 1dd20644dc am: a6fcafe382 am: 2213944986
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2836451 Change-Id: I2c63d6101ea7f55914ff6c5893e833b3b536d72a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--fs/F2fs.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index 23363e3c..07f84805 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -101,7 +101,13 @@ status_t Format(const std::string& source, const std::string& zoned_device) {
cmd.emplace_back(zoned_device.c_str());
cmd.emplace_back("-m");
}
+
+ std::string block_size = std::to_string(getpagesize());
+ cmd.emplace_back("-b");
+ cmd.emplace_back(block_size.c_str());
+
cmd.emplace_back(source.c_str());
+
return logwrap_fork_execvp(cmd.size(), cmd.data(), nullptr, false, LOG_KLOG,
false, nullptr);
}