commit a6fcafe382ad55b44c4459142eda3dc828094028
author Daniel Rosenberg <drosen@google.com> Fri Dec 01 22:36:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 01 22:36:30 2023 +0000
tree a27e218ea0c914e192e48a273559db4a3f2c2524
parent ffa86e0a00eba711a88fa991dbe4afbefa276cad
parent 1dd20644dcfb33b8f469853009f8a6e7b546234c

Merge "Add support for 16k F2FS" into main am: 1dd20644dc

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2836451

Change-Id: I2be3d858550a9a24524db0bf1cafbe0b671b1da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index 23363e3..07f8480 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -101,7 +101,13 @@
         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);
 }