| commit | 0e462aa007cb7bd12932cf95666167c4e47db7b3 | [log] [tgz] |
|---|---|---|
| author | Jaegeuk Kim <jaegeuk@google.com> | Wed Feb 17 02:20:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 17 02:20:24 2021 +0000 |
| tree | ba916dd55b9992b9429c1ceb552f234c8f37ca31 | |
| parent | fa48b67e98fac91d3fbef0a0b31e1e7619491e1a [diff] | |
| parent | 33a4442b548931aadec5cef5d21e4ce6c32ec733 [diff] |
Merge "fiemap: support FIEMAP_EXTENT_MERGED" am: 286e5aba63 am: 33a4442b54 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590474 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I444d96fc0143273a2db60b2926ba333459e835c0
diff --git a/fs_mgr/libfiemap/fiemap_writer.cpp b/fs_mgr/libfiemap/fiemap_writer.cpp index 621031a..8acb885 100644 --- a/fs_mgr/libfiemap/fiemap_writer.cpp +++ b/fs_mgr/libfiemap/fiemap_writer.cpp
@@ -52,7 +52,7 @@ 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));