github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()""

Browse Source 
This reverts commit 3520187422.

Reason for revert: need to reapply after 3/26

Change-Id: I57a17fdd39c6eb1eb372a4b031f1935b6661cb62
Signed-off-by: Todd Kjos <tkjos@google.com>
This commit is contained in:
Jaegeuk Kim 2021-03-17 20:37:28 +00:00 committed by Todd Kjos
parent d6aa6f9c68
commit 42e7f89d79
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/f2fs/data.c
View File

@ -1909,6 +1909,7 @@ 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;