mirror of
https://github.com/torvalds/linux.git
synced 2026-06-08 06:25:52 +02:00
ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()"
This reverts commit 2df558b6f0 ("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>
This commit is contained in:
parent
16982b6a18
commit
3520187422
|
|
@ -1909,7 +1909,6 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (size) {
|
if (size) {
|
||||||
flags |= FIEMAP_EXTENT_MERGED;
|
|
||||||
if (IS_ENCRYPTED(inode))
|
if (IS_ENCRYPTED(inode))
|
||||||
flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;
|
flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user