Linus Torvalds cfcc0ad47f Merge tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs ... Pull f2fs updates from Jaegeuk Kim: "New features: - per-file encryption (e.g., ext4) - FALLOC_FL_ZERO_RANGE - FALLOC_FL_COLLAPSE_RANGE - RENAME_WHITEOUT Major enhancement/fixes: - recovery broken superblocks - enhance f2fs_trim_fs with a discard_map - fix a race condition on dentry block allocation - fix a deadlock during summary operation - fix a missing fiemap result .. and many minor bug fixes and clean-ups were done" * tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (83 commits) f2fs: do not trim preallocated blocks when truncating after i_size f2fs crypto: add alloc_bounce_page f2fs crypto: fix to handle errors likewise ext4 f2fs: drop the volatile_write flag only f2fs: skip committing valid superblock f2fs: setting discard option in parse_options() f2fs: fix to return exact trimmed size f2fs: support FALLOC_FL_INSERT_RANGE f2fs: hide common code in f2fs_replace_block f2fs: disable the discard option when device doesn't support f2fs crypto: remove alloc_page for bounce_page f2fs: fix a deadlock for summary page lock vs. sentry_lock f2fs crypto: clean up error handling in f2fs_fname_setup_filename f2fs crypto: avoid f2fs_inherit_context for symlink f2fs crypto: do not set encryption policy for non-directory by ioctl f2fs crypto: allow setting encryption policy once f2fs crypto: check context consistent for rename2 f2fs: avoid duplicated code by reusing f2fs_read_end_io f2fs crypto: use per-inode tfm structure f2fs: recovering broken superblock during mount ...		2015-06-24 20:38:29 -07:00
..
acl.c	f2fs: make posix_acl_create() safer and cleaner	2015-05-07 11:38:31 -07:00
acl.h	f2fs: avoid deadlock on init_inode_metadata	2014-11-03 16:07:33 -08:00
checkpoint.c	f2fs: introduce update_meta_page	2015-06-01 16:21:00 -07:00
crypto_fname.c	f2fs crypto: clean up error handling in f2fs_fname_setup_filename	2015-06-01 16:21:08 -07:00
crypto_key.c	f2fs crypto: use per-inode tfm structure	2015-06-01 16:21:04 -07:00
crypto_policy.c	f2fs crypto: do not set encryption policy for non-directory by ioctl	2015-06-01 16:21:07 -07:00
crypto.c	f2fs crypto: add alloc_bounce_page	2015-06-11 15:04:20 -07:00
data.c	f2fs: avoid duplicated code by reusing f2fs_read_end_io	2015-06-01 16:21:04 -07:00
debug.c	f2fs: fix building on 32-bit architectures	2015-06-01 16:20:53 -07:00
dir.c	f2fs crypto: use per-inode tfm structure	2015-06-01 16:21:04 -07:00
f2fs_crypto.h	f2fs crypto: remove alloc_page for bounce_page	2015-06-01 16:21:10 -07:00
f2fs.h	f2fs: skip committing valid superblock	2015-06-08 11:20:51 -07:00
file.c	f2fs: do not trim preallocated blocks when truncating after i_size	2015-06-11 18:30:49 -07:00
gc.c	f2fs: fix a deadlock for summary page lock vs. sentry_lock	2015-06-01 16:21:09 -07:00
gc.h	f2fs: fix sparse warnings	2015-02-11 17:04:49 -08:00
hash.c	f2fs: introduce dot and dotdot name check	2015-05-28 15:41:34 -07:00
inline.c	f2fs crypto: add filename encryption for f2fs_lookup	2015-05-28 15:41:54 -07:00
inode.c	f2fs crypto: use per-inode tfm structure	2015-06-01 16:21:04 -07:00
Kconfig	f2fs crypto: add f2fs encryption Kconfig	2015-05-28 15:41:46 -07:00
Makefile	f2fs crypto: filename encryption facilities	2015-05-28 15:41:50 -07:00
namei.c	Merge tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs	2015-06-24 20:38:29 -07:00
node.c	f2fs crypto: add encryption support in read/write paths	2015-05-28 15:41:52 -07:00
node.h	f2fs: move existing definitions into f2fs.h	2015-05-28 15:41:27 -07:00
recovery.c	f2fs: hide common code in f2fs_replace_block	2015-06-02 09:52:07 -07:00
segment.c	f2fs: fix to return exact trimmed size	2015-06-02 15:48:20 -07:00
segment.h	f2fs: introduce discard_map for f2fs_trim_fs	2015-05-28 15:41:39 -07:00
super.c	f2fs: skip committing valid superblock	2015-06-08 11:20:51 -07:00
trace.c	f2fs: add sbi and page pointer in f2fs_io_info	2015-05-28 15:41:32 -07:00
trace.h	f2fs: add sbi and page pointer in f2fs_io_info	2015-05-28 15:41:32 -07:00
xattr.c	f2fs crypto: add encryption policy and password salt support	2015-05-28 15:41:48 -07:00
xattr.h	f2fs crypto: add encryption xattr support	2015-05-28 15:41:47 -07:00