PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca

Browse Source 
am: d6f506e783

Change-Id: I3f07419c0ccb380770220b201981b0fc7c88cc8f
This commit is contained in:
Jin Qian
2017-05-05 19:53:36 +00:00
committed by android-build-merger
parent 4ab07dfcd3 d6f506e783
commit 5975ee6a46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+3 -3
View File
@@ -232,14 +232,14 @@ int format_volume(const char* volume, const char* directory) {
<< ") not supported on " << v->fs_type; << ") not supported on " << v->fs_type;
return -1; return -1;
} }
char *num_sectors; char *num_sectors = nullptr;
if (asprintf(&num_sectors, "%zd", length / 512) <= 0) { if (length >= 512 && asprintf(&num_sectors, "%zd", length / 512) <= 0) {
LOG(ERROR) << "format_volume: failed to create " << v->fs_type LOG(ERROR) << "format_volume: failed to create " << v->fs_type
<< " command for " << v->blk_device; << " command for " << v->blk_device;
return -1; return -1;
} }
const char *f2fs_path = "/sbin/mkfs.f2fs"; const char *f2fs_path = "/sbin/mkfs.f2fs";
const char* const f2fs_argv[] = {"mkfs.f2fs", "-t", "-d1", v->blk_device, num_sectors, NULL}; const char* const f2fs_argv[] = {"mkfs.f2fs", "-t", "-d1", v->blk_device, num_sectors, nullptr};
result = exec_cmd(f2fs_path, (char* const*)f2fs_argv); result = exec_cmd(f2fs_path, (char* const*)f2fs_argv);
free(num_sectors); free(num_sectors);