tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I1ecdffcb,Ib0d1ea81 into main

Browse source 
* changes:
  fs_mgr: Support 16k F2FS
  fs_mgr_overlayfs: Support 16k F2FS
This commit is contained in:
Daniel Rosenberg 2023-12-01 00:52:16 +00:00 committed by Gerrit Code Review
commit 4ae617f676
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_format.cpp
View file

@ -136,6 +136,7 @@ static int format_f2fs(const std::string& fs_blkdev, uint64_t dev_sz, bool needs
/* Format the partition using the calculated length */
const auto size_str = std::to_string(dev_sz / getpagesize());
std::string block_size = std::to_string(getpagesize());
std::vector<const char*> args = {"/system/bin/make_f2fs", "-g", "android"};
if (needs_projid) {
@ -154,6 +155,10 @@ static int format_f2fs(const std::string& fs_blkdev, uint64_t dev_sz, bool needs
args.push_back("-O");
args.push_back("extra_attr");
}
args.push_back("-w");
args.push_back(block_size.c_str());
args.push_back("-b");
args.push_back(block_size.c_str());
if (!zoned_device.empty()) {
args.push_back("-c");
args.push_back(zoned_device.c_str());

2
fs_mgr/fs_mgr_overlayfs_control.cpp
View file

@ -356,6 +356,8 @@ bool MakeScratchFilesystem(const std::string& scratch_device) {
fs_type = "f2fs";
command = kMkF2fs + " -w "s;
command += std::to_string(getpagesize());
command = kMkF2fs + " -b "s;
command += std::to_string(getpagesize());
command += " -f -d1 -l" + android::base::Basename(kScratchMountPoint);
} else if (!access(kMkExt4, X_OK) && fs_mgr_filesystem_available("ext4")) {
fs_type = "ext4";