1 files changed, 15 insertions, 3 deletions

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index d77d15f4b674..e4fc8ea45d78 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/backing-dev.h>
 
 #include "ext4_jbd2.h"
 #include "xattr.h"
@@ -432,8 +433,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
          * the page size, the remaining memory is zeroed when mapped, and
          * writes to that region are not written out to the file."
          */
-        if (len < PAGE_CACHE_SIZE)
-                zero_user_segment(page, len, PAGE_CACHE_SIZE);
+        if (len < PAGE_SIZE)
+                zero_user_segment(page, len, PAGE_SIZE);
         /*
          * In the first loop we prepare and mark buffers to submit. We have to
          * mark all buffers in the page before submitting so that
@@ -470,9 +471,20 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
 
         if (ext4_encrypted_inode(inode) && S_ISREG(inode->i_mode) &&
             nr_to_submit) {
-                data_page = ext4_encrypt(inode, page);
+                gfp_t gfp_flags = GFP_NOFS;
+
+        retry_encrypt:
+                data_page = ext4_encrypt(inode, page, gfp_flags);
                 if (IS_ERR(data_page)) {
                         ret = PTR_ERR(data_page);
+                        if (ret == -ENOMEM && wbc->sync_mode == WB_SYNC_ALL) {
+                                if (io->io_bio) {
+                                        ext4_io_submit(io);
+                                        congestion_wait(BLK_RW_ASYNC, HZ/50);
+                                }
+                                gfp_flags |= __GFP_NOFAIL;
+                                goto retry_encrypt;
+                        }
                         data_page = NULL;
                         goto out;
                 }