From 42e7f89d7942593ad0c2f995edbfe607118cc09c Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 17 Mar 2021 20:37:28 +0000 Subject: [PATCH] Revert "ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()"" This reverts commit 3520187422c2d373e99e0fe66a54d6836360ed09. Reason for revert: need to reapply after 3/26 Change-Id: I57a17fdd39c6eb1eb372a4b031f1935b6661cb62 Signed-off-by: Todd Kjos --- fs/f2fs/data.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 74158ce55319..0aef7c21931a 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1909,6 +1909,7 @@ next: } if (size) { + flags |= FIEMAP_EXTENT_MERGED; if (IS_ENCRYPTED(inode)) flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;