commit 0724e48f9f8c515a30b3b19bfd305ad40796e4b7
author Jaegeuk Kim <jaegeuk@google.com> Tue Feb 16 09:11:45 2021 -0800
committer Jaegeuk Kim <jaegeuk@google.com> Tue Feb 16 13:22:13 2021 -0800
tree 4a2fe305ebafe4f54549aae649f54011980b6fb5
parent d0aa350c02833c003c64d89e9433c3211a0a0fe8

fiemap: support FIEMAP_EXTENT_MERGED

F2FS starts to give a hint, FIEMAP_EXTENT_MERGED, in fiemap, so please allow it.

Bug: 180137825
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ic4e3f573e385d248627da1a2ad64fbbd4a74e679

fs_mgr/libfiemap/fiemap_writer.cpp

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