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
  ...

31 files changed, 3802 insertions, 630 deletions

diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig
index 05f0f663f14c..c629762005bc 100644
--- a/fs/f2fs/Kconfig
+++ b/fs/f2fs/Kconfig
@@ -72,6 +72,25 @@ config F2FS_CHECK_FS
 
           If you want to improve the performance, say N.
 
+config F2FS_FS_ENCRYPTION
+        bool "F2FS Encryption"
+        depends on F2FS_FS
+        depends on F2FS_FS_XATTR
+        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 f2fs 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.
+
 config F2FS_IO_TRACE
         bool "F2FS IO tracer"
         depends on F2FS_FS
diff --git a/fs/f2fs/Makefile b/fs/f2fs/Makefile
index d92397731db8..396be1a39e55 100644
--- a/fs/f2fs/Makefile
+++ b/fs/f2fs/Makefile
@@ -6,3 +6,5 @@ f2fs-$(CONFIG_F2FS_STAT_FS) += debug.o
 f2fs-$(CONFIG_F2FS_FS_XATTR) += xattr.o
 f2fs-$(CONFIG_F2FS_FS_POSIX_ACL) += acl.o
 f2fs-$(CONFIG_F2FS_IO_TRACE) += trace.o
+f2fs-$(CONFIG_F2FS_FS_ENCRYPTION) += crypto_policy.o crypto.o \
+                crypto_key.o crypto_fname.o
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 4320ffab3495..c8f25f7241f0 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -334,51 +334,45 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,
                 struct page *dpage)
 {
         struct posix_acl *p;
+        struct posix_acl *clone;
         int ret;
 
+        *acl = NULL;
+        *default_acl = NULL;
+
         if (S_ISLNK(*mode) || !IS_POSIXACL(dir))
-                goto no_acl;
+                return 0;
 
         p = __f2fs_get_acl(dir, ACL_TYPE_DEFAULT, dpage);
-        if (IS_ERR(p)) {
-                if (p == ERR_PTR(-EOPNOTSUPP))
-                        goto apply_umask;
-                return PTR_ERR(p);
+        if (!p || p == ERR_PTR(-EOPNOTSUPP)) {
+                *mode &= ~current_umask();
+                return 0;
         }
+        if (IS_ERR(p))
+                return PTR_ERR(p);
 
-        if (!p)
-                goto apply_umask;
-
-        *acl = f2fs_acl_clone(p, GFP_NOFS);
-        if (!*acl)
+        clone = f2fs_acl_clone(p, GFP_NOFS);
+        if (!clone)
                 goto no_mem;
 
-        ret = f2fs_acl_create_masq(*acl, mode);
+        ret = f2fs_acl_create_masq(clone, mode);
         if (ret < 0)
                 goto no_mem_clone;
 
-        if (ret == 0) {
-                posix_acl_release(*acl);
-                *acl = NULL;
-        }
+        if (ret == 0)
+                posix_acl_release(clone);
+        else
+                *acl = clone;
 
-        if (!S_ISDIR(*mode)) {
+        if (!S_ISDIR(*mode))
                 posix_acl_release(p);
-                *default_acl = NULL;
-        } else {
+        else
                 *default_acl = p;
-        }
-        return 0;
 
-apply_umask:
-        *mode &= ~current_umask();
-no_acl:
-        *default_acl = NULL;
-        *acl = NULL;
         return 0;
 
 no_mem_clone:
-        posix_acl_release(*acl);
+        posix_acl_release(clone);
 no_mem:
         posix_acl_release(p);
         return -ENOMEM;
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index a5e17a2a0781..b70bbe1a6a8c 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -52,9 +52,11 @@ struct page *get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index)
         struct address_space *mapping = META_MAPPING(sbi);
         struct page *page;
         struct f2fs_io_info fio = {
+                .sbi = sbi,
                 .type = META,
                 .rw = READ_SYNC | REQ_META | REQ_PRIO,
                 .blk_addr = index,
+                .encrypted_page = NULL,
         };
 repeat:
         page = grab_cache_page(mapping, index);
@@ -65,7 +67,9 @@ repeat:
         if (PageUptodate(page))
                 goto out;
 
-        if (f2fs_submit_page_bio(sbi, page, &fio))
+        fio.page = page;
+
+        if (f2fs_submit_page_bio(&fio))
                 goto repeat;
 
         lock_page(page);
@@ -77,8 +81,7 @@ out:
         return page;
 }
 
-static inline bool is_valid_blkaddr(struct f2fs_sb_info *sbi,
-                                                block_t blkaddr, int type)
+bool is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type)
 {
         switch (type) {
         case META_NAT:
@@ -118,8 +121,10 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, int type
         struct page *page;
         block_t blkno = start;
         struct f2fs_io_info fio = {
+                .sbi = sbi,