Commit fcec9532 authored Apr 07, 2019 by Blagovest Kolenichev

Merge android-4.14 (d4e5dea0) into msm-4.14



* refs/heads/tmp-d4e5dea0:
  Revert "f2fs: avoid f2fs_bug_on if f2fs_get_meta_page_nofail got EIO"
  Revert "f2fs: submit cached bio to avoid endless PageWriteback"
  ANDROID: sdcardfs: Add option to drop unused dentries
  f2fs: fix to keep project quota consistent
  f2fs: guarantee journalled quota data by checkpoint
  f2fs: cleanup dirty pages if recover failed
  f2fs: fix data corruption issue with hardware encryption
  f2fs: fix to recover inode->i_flags of inode block during POR
  f2fs: spread f2fs_set_inode_flags()
  f2fs: fix to spread clear_cold_data()
  Revert "f2fs: fix to clear PG_checked flag in set_page_dirty()"
  f2fs: account read IOs and use IO counts for is_idle
  f2fs: fix to account IO correctly for cgroup writeback
  f2fs: fix to account IO correctly
  f2fs: remove request_list check in is_idle()
  f2fs: allow to mount, if quota is failed
  f2fs: update REQ_TIME in f2fs_cross_rename()
  f2fs: do not update REQ_TIME in case of error conditions
  f2fs: remove unneeded disable_nat_bits()
  f2fs: remove unused sbi->trigger_ssr_threshold
  f2fs: shrink sbi->sb_lock coverage in set_file_temperature()
  f2fs: use rb_*_cached friends
  f2fs: fix to recover cold bit of inode block during POR
  f2fs: submit cached bio to avoid endless PageWriteback
  f2fs: checkpoint disabling
  f2fs: clear PageError on the read path
  f2fs: allow out-place-update for direct IO in LFS mode
  f2fs: refactor ->page_mkwrite() flow
  Revert: "f2fs: check last page index in cached bio to decide submission"
  f2fs: support superblock checksum
  f2fs: add to account skip count of background GC
  f2fs: add to account meta IO
  f2fs: keep lazytime on remount
  f2fs: fix missing up_read
  f2fs: return correct errno in f2fs_gc
  f2fs: avoid f2fs_bug_on if f2fs_get_meta_page_nofail got EIO
  f2fs: mark inode dirty explicitly in recover_inode()
  f2fs: fix to recover inode's crtime during POR
  f2fs: fix to recover inode's i_gc_failures during POR
  f2fs: fix to recover inode's i_flags during POR
  f2fs: fix to recover inode's project id during POR
  f2fs: update i_size after DIO completion
  f2fs: report ENOENT correctly in f2fs_rename
  f2fs: fix remount problem of option io_bits
  f2fs: fix to recover inode's uid/gid during POR
  f2fs: avoid infinite loop in f2fs_alloc_nid
  f2fs: add new idle interval timing for discard and gc paths
  f2fs: split IO error injection according to RW
  f2fs: add SPDX license identifiers
  f2fs: surround fault_injection related option parsing using CONFIG_F2FS_FAULT_INJECTION
  f2fs: fix setattr project check upon fssetxattr ioctl
  f2fs: avoid sleeping under spin_lock
  f2fs: plug readahead IO in readdir()
  f2fs: fix to do sanity check with current segment number
  f2fs: fix memory leak of percpu counter in fill_super()
  f2fs: fix memory leak of write_io in fill_super()
  f2fs: cache NULL when both default_acl and acl are NULL
  f2fs: fix to flush all dirty inodes recovered in readonly fs
  f2fs: report error if quota off error during umount
  f2fs: submit bio after shutdown
  f2fs: avoid wrong decrypted data from disk
  Revert "f2fs: use printk_ratelimited for f2fs_msg"
  f2fs: fix unnecessary periodic wakeup of discard thread when dev is busy
  f2fs: fix to avoid NULL pointer dereference on se->discard_map
  f2fs: add additional sanity check in f2fs_acl_from_disk()
  Revert "ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB""
  Revert "ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB""
  ANDROID: sched/fair: initialise util_est values to 0 on fork
  Revert "FROMGIT: crypto: speck - add support for the Speck block cipher"
  Revert "FROMGIT: crypto: speck - export common helpers"
  Revert "FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "FROMGIT: crypto: speck - add test vectors for Speck128-XTS"
  Revert "FROMGIT: crypto: speck - add test vectors for Speck64-XTS"
  Revert "FROMLIST: crypto: arm64/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "fscrypt: add Speck128/256 support"
  ANDROID: x86_64_cuttlefish_defconfig: disable CONFIG_MEMORY_STATE_TIME
  ANDROID: sdcardfs: Change current->fs under lock
  Revert "ANDROID: sdcardfs: Change current->fs under lock"
  ANDROID: sdcardfs: Change current->fs under lock
  ANDROID: sdcardfs: Don't use OVERRIDE_CRED macro
  ANDROID: arm64: kbuild: only specify code model with LTO for modules
  ANDROID: kbuild: disable LTO_CLANG with KASAN

Conflicts:
	fs/crypto/fscrypt_private.h
	fs/crypto/keyinfo.c
	fs/f2fs/data.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/inode.c
	fs/f2fs/recovery.c
	fs/f2fs/segment.c
	fs/f2fs/super.c

Change-Id: I03c51d9093de87ae3ababda419a4d436bc637517
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parents ec3c7a7a 71347a7a

Documentation/ABI/testing/sysfs-fs-f2fs

+16 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,22 @@ What: /sys/fs/f2fs/<disk>/idle_interval
		Date: January 2016
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls the idle timing.
		Controls the idle timing for all paths other than
		discard and gc path.

		What: /sys/fs/f2fs/<disk>/discard_idle_interval
		Date: September 2018
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Contact: "Sahitya Tummala" <stummala@codeaurora.org>
		Description:
		Controls the idle timing for discard path.

		What: /sys/fs/f2fs/<disk>/gc_idle_interval
		Date: September 2018
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Contact: "Sahitya Tummala" <stummala@codeaurora.org>
		Description:
		Controls the idle timing for gc path.

		What: /sys/fs/f2fs/<disk>/iostat_enable
		Date: August 2017

Documentation/filesystems/f2fs.txt

+7 −1

Original line number	Diff line number	Diff line
		@@ -172,9 +172,10 @@ fault_type=%d Support configuring fault injection type, should be
		FAULT_DIR_DEPTH 0x000000100
		FAULT_EVICT_INODE 0x000000200
		FAULT_TRUNCATE 0x000000400
		FAULT_IO 0x000000800
		FAULT_READ_IO 0x000000800
		FAULT_CHECKPOINT 0x000001000
		FAULT_DISCARD 0x000002000
		FAULT_WRITE_IO 0x000004000
		mode=%s Control block allocation mode which supports "adaptive"
		and "lfs". In "lfs" mode, there should be no random
		writes towards main area.
		@@ -211,6 +212,11 @@ fsync_mode=%s Control the policy of fsync. Currently supports "posix",
		non-atomic files likewise "nobarrier" mount option.
		test_dummy_encryption Enable dummy encryption, which provides a fake fscrypt
		context. The fake fscrypt context is used by xfstests.
		checkpoint=%s Set to "disable" to turn off checkpointing. Set to "enable"
		to reenable checkpointing. Is enabled by default. While
		disabled, any unmounting or unexpected shutdowns will cause
		the filesystem contents to appear as they did when the
		filesystem was mounted with that option.

		================================================================================
		DEBUGFS ENTRIES

Documentation/filesystems/fscrypt.rst

deleted100644 → 0

+0 −626

File deleted.

Preview size limit exceeded, changes collapsed.

arch/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -635,6 +635,7 @@ config LTO_CLANG
		bool "Use clang Link Time Optimization (LTO) (EXPERIMENTAL)"
		depends on ARCH_SUPPORTS_LTO_CLANG
		depends on !FTRACE_MCOUNT_RECORD \|\| HAVE_C_RECORDMCOUNT
		depends on !KASAN
		select LTO
		select THIN_ARCHIVES
		select LD_DEAD_CODE_DATA_ELIMINATION

arch/arm/crypto/Kconfig

+0 −6

Original line number	Diff line number	Diff line
		@@ -121,10 +121,4 @@ config CRYPTO_CHACHA20_NEON
		select CRYPTO_BLKCIPHER
		select CRYPTO_CHACHA20

		config CRYPTO_SPECK_NEON
		tristate "NEON accelerated Speck cipher algorithms"
		depends on KERNEL_MODE_NEON
		select CRYPTO_BLKCIPHER
		select CRYPTO_SPECK

		endif