openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 22a01eed3a

Change-Id: Ice4f2b39fb97cbda876e2b136a00834952c22e0d
This commit is contained in:
David Anderson 2019-03-12 09:43:37 -07:00 committed by android-build-merger
parent cff70e6328 22a01eed3a
commit 1912bda2d8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs_mgr/libfiemap_writer/fiemap_writer.cpp
View File

@ -501,12 +501,13 @@ static bool ReadFibmap(int file_fd, const std::string& file_path,
}
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;
}