commit 7f6d6db24d2bd69d89b66029007f8af1e1bddb0c
author David Anderson <dvander@google.com> Tue Mar 12 16:20:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 16:20:56 2019 +0000
tree ef4ca219eb5f6113e759cb4688da513891162089
parent 8d246b22ee42bc4558af4e69a8ed843c62891438
parent f9134aa1d5e56c961dfdae00930c04a26cbe39bd

Merge "libfiemap_writer: Fix bugs in vfat handling."

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;
     }