summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConnor O'Brien <connoro@google.com>2017-01-25 05:16:19 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-25 05:16:19 +0100
commita78bbda4e22afa3109fafa64663ea2aa7d562c72 (patch)
treee03f0a512976f7dcbba4b0cd9f301ee351b995e6
parentMerge "minui: Move callback functions to std::function." (diff)
parentMerge "Use flash erase & logical block size for userdata wipe" (diff)
downloadandroid_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar.gz
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar.bz2
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar.lz
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar.xz
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.tar.zst
android_bootable_recovery-a78bbda4e22afa3109fafa64663ea2aa7d562c72.zip
-rw-r--r--roots.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/roots.cpp b/roots.cpp
index 14018fcdc..376fcbd1b 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -215,7 +215,12 @@ int format_volume(const char* volume, const char* directory) {
}
int result;
if (strcmp(v->fs_type, "ext4") == 0) {
- result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);
+ if (v->erase_blk_size != 0 && v->logical_blk_size != 0) {
+ result = make_ext4fs_directory_align(v->blk_device, length, volume, sehandle,
+ directory, v->erase_blk_size, v->logical_blk_size);
+ } else {
+ result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);
+ }
} else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
LOG(ERROR) << "format_volume: crypt footer + negative length (" << length