From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Mar 2019 18:54:24 +0000 (-0800)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: v5.4-rc1~1456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1cae94871330cb9f5fdcea34529abf7917e682e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:
 "First: Ted, Jaegeuk, and I have decided to add me as a co-maintainer
  for fscrypt, and we're now using a shared git tree. So we've updated
  MAINTAINERS accordingly, and I'm doing the pull request this time.

  The actual changes for v5.1 are:

   - Remove the fs-specific kconfig options like CONFIG_EXT4_ENCRYPTION
     and make fscrypt support for all fscrypt-capable filesystems be
     controlled by CONFIG_FS_ENCRYPTION, similar to how CONFIG_QUOTA
     works.

   - Improve error code for rename() and link() into encrypted
     directories.

   - Various cleanups"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  MAINTAINERS: add Eric Biggers as an fscrypt maintainer
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: remove CRYPTO_CTR dependency
---

d1cae94871330cb9f5fdcea34529abf7917e682e
diff --cc fs/ext4/page-io.c
index cff4c4a,b9d6cab..6f5305e
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -63,11 -63,10 +63,11 @@@ static void ext4_finish_bio(struct bio 
  {
  	int i;
  	struct bio_vec *bvec;
 +	struct bvec_iter_all iter_all;
  
 -	bio_for_each_segment_all(bvec, bio, i) {
 +	bio_for_each_segment_all(bvec, bio, i, iter_all) {
  		struct page *page = bvec->bv_page;
- #ifdef CONFIG_EXT4_FS_ENCRYPTION
+ #ifdef CONFIG_FS_ENCRYPTION
  		struct page *data_page = NULL;
  #endif
  		struct buffer_head *bh, *head;