Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[tomoyo/tomoyo-test1.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 35561cd..420fe3d 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1170,8 +1170,9 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,
        int err = 0;
        unsigned blocksize = inode->i_sb->s_blocksize;
        unsigned bbits;
-       struct buffer_head *bh, *head, *wait[2], **wait_bh = wait;
-       bool decrypt = false;
+       struct buffer_head *bh, *head, *wait[2];
+       int nr_wait = 0;
+       int i;
 
        BUG_ON(!PageLocked(page));
        BUG_ON(from > PAGE_SIZE);
@@ -1223,23 +1224,32 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,
                    !buffer_unwritten(bh) &&
                    (block_start < from || block_end > to)) {
                        ll_rw_block(REQ_OP_READ, 0, 1, &bh);
-                       *wait_bh++ = bh;
-                       decrypt = IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode);
+                       wait[nr_wait++] = bh;
                }
        }
        /*
         * If we issued read requests, let them complete.
         */
-       while (wait_bh > wait) {
-               wait_on_buffer(*--wait_bh);
-               if (!buffer_uptodate(*wait_bh))
+       for (i = 0; i < nr_wait; i++) {
+               wait_on_buffer(wait[i]);
+               if (!buffer_uptodate(wait[i]))
                        err = -EIO;
        }
-       if (unlikely(err))
+       if (unlikely(err)) {
                page_zero_new_buffers(page, from, to);
-       else if (decrypt)
-               err = fscrypt_decrypt_page(page->mapping->host, page,
-                               PAGE_SIZE, 0, page->index);
+       } else if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) {
+               for (i = 0; i < nr_wait; i++) {
+                       int err2;
+
+                       err2 = fscrypt_decrypt_pagecache_blocks(page, blocksize,
+                                                               bh_offset(wait[i]));
+                       if (err2) {
+                               clear_buffer_uptodate(wait[i]);
+                               err = err2;
+                       }
+               }
+       }
+
        return err;
 }
 #endif
@@ -4071,9 +4081,8 @@ static int __ext4_block_zero_page_range(handle_t *handle,
                if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode)) {
                        /* We expect the key to be set. */
                        BUG_ON(!fscrypt_has_encryption_key(inode));
-                       BUG_ON(blocksize != PAGE_SIZE);
-                       WARN_ON_ONCE(fscrypt_decrypt_page(page->mapping->host,
-                                               page, PAGE_SIZE, 0, page->index));
+                       WARN_ON_ONCE(fscrypt_decrypt_pagecache_blocks(
+                                       page, blocksize, bh_offset(bh)));
                }
        }
        if (ext4_should_journal_data(inode)) {