Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a4442b authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Automerger Merge Worker
Browse files

Merge "fiemap: support FIEMAP_EXTENT_MERGED" am: 286e5aba 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46a34fe7939ec85f66be4b7d458dd117d0e2f40d
parents aea25045 286e5aba

fs_mgr/libfiemap/fiemap_writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static constexpr uint32_t kMaxExtents = 50000; 
static constexpr const uint32_t kUnsupportedExtentFlags =

        FIEMAP_EXTENT_UNKNOWN | FIEMAP_EXTENT_UNWRITTEN | FIEMAP_EXTENT_DELALLOC |

        FIEMAP_EXTENT_NOT_ALIGNED | FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_DATA_TAIL |

        FIEMAP_EXTENT_UNWRITTEN | FIEMAP_EXTENT_SHARED | FIEMAP_EXTENT_MERGED;

        FIEMAP_EXTENT_UNWRITTEN | FIEMAP_EXTENT_SHARED;



// Large file support must be enabled.

static_assert(sizeof(off_t) == sizeof(uint64_t));