Commit d407574e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs updates from Jaegeuk Kim:
 "New Features:
   - uplift filesystem encryption into fs/crypto/
   - give sysfs entries to control memroy consumption

  Enhancements:
   - aio performance by preallocating blocks in ->write_iter
   - use writepages lock for only WB_SYNC_ALL
   - avoid redundant inline_data conversion
   - enhance forground GC
   - use wait_for_stable_page as possible
   - speed up SEEK_DATA and fiiemap

  Bug Fixes:
   - corner case in terms of -ENOSPC for inline_data
   - hung task caused by long latency in shrinker
   - corruption between atomic write and f2fs_trace_pid
   - avoid garbage lengths in dentries
   - revoke atomicly written pages if an error occurs

  In addition, there are various minor bug fixes and clean-ups"

* tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (81 commits)
  f2fs: submit node page write bios when really required
  f2fs: add missing argument to f2fs_setxattr stub
  f2fs: fix to avoid unneeded unlock_new_inode
  f2fs: clean up opened code with f2fs_update_dentry
  f2fs: declare static functions
  f2fs: use cryptoapi crc32 functions
  f2fs: modify the readahead method in ra_node_page()
  f2fs crypto: sync ext4_lookup and ext4_file_open
  fs crypto: move per-file encryption from f2fs tree to fs/crypto
  f2fs: mutex can't be used by down_write_nest_lock()
  f2fs: recovery missing dot dentries in root directory
  f2fs: fix to avoid deadlock when merging inline data
  f2fs: introduce f2fs_flush_merged_bios for cleanup
  f2fs: introduce f2fs_update_data_blkaddr for cleanup
  f2fs crypto: fix incorrect positioning for GCing encrypted data page
  f2fs: fix incorrect upper bound when iterating inode mapping tree
  f2fs: avoid hungtask problem caused by losing wake_up
  f2fs: trace old block address for CoWed page
  f2fs: try to flush inode after merging inline data
  f2fs: show more info about superblock recovery
  ...
parents 5518f66b 12bb0a8f

Documentation/ABI/testing/sysfs-fs-f2fs

+14 −0
Original line number Diff line number Diff line
@@ -98,3 +98,17 @@ Date: October 2015 
Contact:	"Chao Yu" <chao2.yu@samsung.com>

Description:

		 Controls the count of nid pages to be readaheaded.



What:		/sys/fs/f2fs/<disk>/dirty_nats_ratio

Date:		January 2016

Contact:	"Chao Yu" <chao2.yu@samsung.com>

Description:

		 Controls dirty nat entries ratio threshold, if current

		 ratio exceeds configured threshold, checkpoint will

		 be triggered for flushing dirty nat entries.



What:		/sys/fs/f2fs/<disk>/lifetime_write_kbytes

Date:		January 2016

Contact:	"Shuoran Liu" <liushuoran@huawei.com>

Description:

		 Shows total written kbytes issued to disk.

fs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ config MANDATORY_FILE_LOCKING 


	  To the best of my knowledge this is dead code that no one cares about.



source "fs/crypto/Kconfig"



source "fs/notify/Kconfig"



source "fs/quota/Kconfig"

fs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_EVENTFD) += eventfd.o 
obj-$(CONFIG_USERFAULTFD)	+= userfaultfd.o

obj-$(CONFIG_AIO)               += aio.o

obj-$(CONFIG_FS_DAX)		+= dax.o

obj-$(CONFIG_FS_ENCRYPTION)	+= crypto/

obj-$(CONFIG_FILE_LOCKING)      += locks.o

obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o

obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o

fs/crypto/Kconfig

0 → 100644
+18 −0
Original line number Diff line number Diff line 
config FS_ENCRYPTION

	tristate "FS Encryption (Per-file encryption)"

	depends on BLOCK

	select CRYPTO

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_XTS

	select CRYPTO_CTS

	select CRYPTO_CTR

	select CRYPTO_SHA256

	select KEYS

	select ENCRYPTED_KEYS

	help

	  Enable encryption of files and directories.  This

	  feature is similar to ecryptfs, but it is more memory

	  efficient since it avoids caching the encrypted and

	  decrypted pages in the page cache.

fs/crypto/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_FS_ENCRYPTION)	+= fscrypto.o



fscrypto-y := crypto.o fname.o policy.o keyinfo.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE