Merge tag 'v4.9.214' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

[platform/kernel/linux-amlogic.git] / fs / ext4 / page-io.c

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 0718a86..d68032b 100644 (file)
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -468,17 +468,26 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
            nr_to_submit) {
                gfp_t gfp_flags = GFP_NOFS;
 
+               /*
+                * Since bounce page allocation uses a mempool, we can only use
+                * a waiting mask (i.e. request guaranteed allocation) on the
+                * first page of the bio.  Otherwise it can deadlock.
+                */
+               if (io->io_bio)
+                       gfp_flags = GFP_NOWAIT | __GFP_NOWARN;
        retry_encrypt:
                data_page = fscrypt_encrypt_page(inode, page, PAGE_SIZE, 0,
                                                page->index, 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) {
+                       if (ret == -ENOMEM &&
+                           (io->io_bio || wbc->sync_mode == WB_SYNC_ALL)) {
+                               gfp_flags = GFP_NOFS;
+                               if (io->io_bio)
                                        ext4_io_submit(io);
-                                       congestion_wait(BLK_RW_ASYNC, HZ/50);
-                               }
-                               gfp_flags |= __GFP_NOFAIL;
+                               else
+                                       gfp_flags |= __GFP_NOFAIL;
+                               congestion_wait(BLK_RW_ASYNC, HZ/50);
                                goto retry_encrypt;
                        }
                        data_page = NULL;