commit 5d1769bc5c073a53f8eb41e835c1f01970220def
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 19 05:29:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 19 05:29:17 2018 +0000
tree d26642286280633c520b1e1f4c239ceeaebb60db
parent c14f0b4c782481369967d7b1bea47b58104b1ed1
parent a61ff299f15f70d5d8bffb7536dd6ab0839cd0f3

Merge "liblp: Always align the first usable sector."

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index ea78e9b..80257fe 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -268,8 +268,13 @@
     }
 
     // Compute the first free sector, factoring in alignment.
-    uint64_t free_area_start =
-            AlignTo(total_reserved, device_info.alignment, device_info.alignment_offset);
+    uint64_t free_area_start = total_reserved;
+    if (device_info.alignment || device_info.alignment_offset) {
+        free_area_start =
+                AlignTo(free_area_start, device_info.alignment, device_info.alignment_offset);
+    } else {
+        free_area_start = AlignTo(free_area_start, device_info.logical_block_size);
+    }
     uint64_t first_sector = free_area_start / LP_SECTOR_SIZE;
 
     // There must be one logical block of free space remaining (enough for one partition).