github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
bd42f569a7
linux/fs/f2fs
History
Eric Biggers 2b4c70da98 ANDROID: f2fs: fix bad merge resolutions 
The encrypt+casefold support needed to be adjusted following refactoring
of f2fs filename handing upstream.  Also, the upstream change to
f2fs_d_compare() needed to be moved to generic_ci_d_compare().  See
http://aosp/1341990 and also the other branches like android-5.4-stable.

Also, a call f2fs_set_bio_crypt_ctx() went missing.

Fixes: 8912845e4e ("Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline")
Change-Id: Icd92029bab74e161497a1f03201826a737955725
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-06-25 08:49:01 -07:00
..
acl.c f2fs: Replace spaces with tab 2019-05-08 21:23:11 -07:00
acl.h f2fs: Use the correct style for SPDX License Identifier 2020-05-08 06:55:55 -07:00
checkpoint.c f2fs: don't return vmalloc() memory from f2fs_kmalloc() 2020-06-08 20:34:58 -07:00
compress.c Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-06-25 08:23:49 +02:00
data.c ANDROID: f2fs: fix bad merge resolutions 2020-06-25 08:49:01 -07:00
debug.c f2fs: show mounted time 2020-03-19 11:41:25 -07:00
dir.c ANDROID: f2fs: fix bad merge resolutions 2020-06-25 08:49:01 -07:00
extent_cache.c f2fs: introduce f2fs_<level> macros to wrap f2fs_printk() 2019-07-02 15:40:40 -07:00
f2fs.h ANDROID: f2fs: fix bad merge resolutions 2020-06-25 08:49:01 -07:00
file.c f2fs: handle readonly filesystem in f2fs_ioc_shutdown() 2020-06-08 20:37:53 -07:00
gc.c f2fs: add compressed/gc data read IO stat 2020-05-11 20:37:13 -07:00
gc.h f2fs: Use the correct style for SPDX License Identifier 2020-05-08 06:55:55 -07:00
hash.c ANDROID: f2fs: fix bad merge resolutions 2020-06-25 08:49:01 -07:00
inline.c Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-06-25 08:23:49 +02:00
inode.c f2fs: fix potential .flags overflow on 32bit architecture 2020-03-30 20:46:25 -07:00
Kconfig f2fs: compress: support lzo-rle compress algorithm 2020-05-11 20:36:46 -07:00
Makefile f2fs: support data compression 2020-01-17 16:48:07 -08:00
namei.c Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-06-25 08:23:49 +02:00
node.c f2fs: don't return vmalloc() memory from f2fs_kmalloc() 2020-06-08 20:34:58 -07:00
node.h f2fs: shrink spinlock coverage 2020-05-11 20:36:46 -07:00
recovery.c ANDROID: f2fs: fix bad merge resolutions 2020-06-25 08:49:01 -07:00
segment.c f2fs: fix wrong discard space 2020-05-30 08:17:52 -07:00
segment.h f2fs: Use the correct style for SPDX License Identifier 2020-05-08 06:55:55 -07:00
shrinker.c f2fs: fix inconsistent comments 2020-03-10 09:18:33 -07:00
super.c Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-06-25 08:23:49 +02:00
sysfs.c Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-06-25 08:23:49 +02:00
trace.c f2fs: do not use mutex lock in atomic context 2019-03-05 19:58:06 -08:00
trace.h f2fs: Use the correct style for SPDX License Identifier 2020-05-08 06:55:55 -07:00
verity.c mm: add page_cache_readahead_unbounded 2020-06-02 10:59:06 -07:00
xattr.c Merge f40f31cadc ("Merge tag 'f2fs-for-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline 2020-04-10 11:34:04 +02:00
xattr.h f2fs: code cleanup by removing ifdef macro surrounding 2020-05-26 18:56:10 -07:00