f2fs: catch up to v4.14-rc1
authorHyojun Kim <hyojun@google.com>
Sat, 7 Oct 2017 00:10:08 +0000 (17:10 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 13 Oct 2017 11:27:08 +0000 (11:27 +0000)
commit63da4200cbc27828bb9439b84059aa48cda5adf9
treeac0207a65bafb1f55ca84a2200ce181d470878d2
parent05c85a6ddfcf1a39d4c7456279faa395c1ac5b8e
f2fs: catch up to v4.14-rc1

Cherry-picked from upstream-f2fs-stable-linux-4.9.y

Changes include:

commit 30da3a4de96733 ("f2fs: hurry up to issue discard after io interruption")
commit d1c363b48398d4 ("f2fs: fix to show correct discard_granularity in sysfs")
...

commit e6b120d4d01ab0 ("f2fs/fscrypt: catch up to v4.12")
commit 4d7931d72758db ("KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()")

Signed-off-by: Hyojun Kim <hyojun@google.com>
63 files changed:
Documentation/ABI/testing/sysfs-fs-f2fs
Documentation/filesystems/f2fs.txt
Documentation/security/keys.txt
fs/cifs/connect.c
fs/crypto/Kconfig
fs/crypto/Makefile
fs/crypto/bio.c [new file with mode: 0644]
fs/crypto/crypto.c
fs/crypto/fname.c
fs/crypto/fscrypt_private.h [new file with mode: 0644]
fs/crypto/keyinfo.c
fs/crypto/policy.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ext4/ext4.h
fs/ext4/ialloc.c
fs/ext4/inline.c
fs/ext4/inode.c
fs/ext4/ioctl.c
fs/ext4/namei.c
fs/ext4/page-io.c
fs/ext4/super.c
fs/f2fs/Makefile
fs/f2fs/acl.c
fs/f2fs/checkpoint.c
fs/f2fs/data.c
fs/f2fs/debug.c
fs/f2fs/dir.c
fs/f2fs/extent_cache.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/gc.c
fs/f2fs/gc.h
fs/f2fs/inline.c
fs/f2fs/inode.c
fs/f2fs/namei.c
fs/f2fs/node.c
fs/f2fs/node.h
fs/f2fs/recovery.c
fs/f2fs/segment.c
fs/f2fs/segment.h
fs/f2fs/shrinker.c
fs/f2fs/super.c
fs/f2fs/sysfs.c [new file with mode: 0644]
fs/f2fs/trace.c
fs/f2fs/xattr.c
fs/f2fs/xattr.h
fs/fscache/object-list.c
fs/nfs/nfs4idmap.c
include/keys/user-type.h
include/linux/f2fs_fs.h
include/linux/fscrypt_common.h [new file with mode: 0644]
include/linux/fscrypt_notsupp.h [new file with mode: 0644]
include/linux/fscrypt_supp.h [new file with mode: 0644]
include/linux/fscrypto.h [deleted file]
include/linux/key.h
include/trace/events/f2fs.h
include/uapi/linux/fs.h
lib/digsig.c
net/dns_resolver/dns_query.c
security/keys/dh.c
security/keys/encrypted-keys/encrypted.c
security/keys/trusted.c
security/keys/user_defined.c