From 3520187422c2d373e99e0fe66a54d6836360ed09 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@codeaurora.org>
Date: Tue, 16 Mar 2021 23:26:16 -0700
Subject: [PATCH] ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in
 f2fs_fiemap()"

This reverts commit 2df558b6f050 ("f2fs: fix to tag FIEMAP_EXTENT_MERGED
in f2fs_fiemap()") as this breaks older Android userspaces without
aosp/1590474.

Bug: 182956687
Change-Id: Iaff9f0f39e03201f198af87c01e6faf38da1b0f0
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
---
 fs/f2fs/data.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 0aef7c21931a..74158ce55319 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1909,7 +1909,6 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 	}
 
 	if (size) {
-		flags |= FIEMAP_EXTENT_MERGED;
 		if (IS_ENCRYPTED(inode))
 			flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;