commit 965a17b1ee9190ddc5be8935bc0d8b340d07429e
author David Anderson <dvander@google.com> Tue Mar 12 09:39:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 09:39:31 2019 -0700
tree 1b7da73580316b9b74dae7de11c49207e98d514b
parent 63c44771c0a6fccbd473079811fd1cc634e026ae
parent 02386493952dc6d20ded94995f83284799bbbaeb

Merge "libfiemap_writer: Fix bugs in vfat handling."
am: 7f6d6db24d

Change-Id: I654e9ce9b72ad9f52a7324b36fe227e1750ae741

fs_mgr/libfiemap_writer/fiemap_writer.cpp

diff --git a/fs_mgr/libfiemap_writer/fiemap_writer.cpp b/fs_mgr/libfiemap_writer/fiemap_writer.cpp
index 99a1a2f..5b77280 100644
--- a/fs_mgr/libfiemap_writer/fiemap_writer.cpp
+++ b/fs_mgr/libfiemap_writer/fiemap_writer.cpp
@@ -501,12 +501,13 @@
         }
 
         if (!extents->empty() && block == last_block + 1) {
-            extents->back().fe_length++;
+            extents->back().fe_length += s.st_blksize;
         } else {
-            extents->push_back(fiemap_extent{.fe_logical = block_number,
-                                             .fe_physical = block,
-                                             .fe_length = 1,
-                                             .fe_flags = 0});
+            extents->push_back(
+                    fiemap_extent{.fe_logical = block_number,
+                                  .fe_physical = static_cast<uint64_t>(block) * s.st_blksize,
+                                  .fe_length = static_cast<uint64_t>(s.st_blksize),
+                                  .fe_flags = 0});
         }
         last_block = block;
     }