commit e3a55e2b31a7f6526eaea39020b93e8498231717
author Connor O'Brien <connoro@google.com> Wed Jan 25 04:28:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 04:28:09 2017 +0000
tree a93052fb13c17955e033634f8b0d832982b7d9b2
parent a7915380bb2fcff29a58eff59b5465af77ea29d9
parent b6684d327f6e1c1b8c05f2ca57283063cfc3f38b

Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712
am: b6684d327f

Change-Id: I02ff6a6d8c01360cedbb14e62e78b73cc885005f

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index 14018fc..376fcbd 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -215,7 +215,12 @@
         }
         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