X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Ff2fs%2Fdata.c;h=0a1d236212f852dff6cf7d18ccbc9b2e10808986;hb=1d1df41c5a33359a00e919d54eaebfb789711fdc;hp=0fc6e0245732864acee4e0faaf6b081f94dd7bd5;hpb=5fed0be8583f08c1548b4dcd9e5ee0d1133d0730;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 0fc6e0245732..0a1d236212f8 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -8,9 +8,9 @@
 #include <linux/fs.h>
 #include <linux/f2fs_fs.h>
 #include <linux/buffer_head.h>
+#include <linux/sched/mm.h>
 #include <linux/mpage.h>
 #include <linux/writeback.h>
-#include <linux/backing-dev.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
 #include <linux/bio.h>
@@ -2450,7 +2450,7 @@ retry_encrypt:
 		/* flush pending IOs and wait for a while in the ENOMEM case */
 		if (PTR_ERR(fio->encrypted_page) == -ENOMEM) {
 			f2fs_flush_merged_writes(fio->sbi);
-			congestion_wait(BLK_RW_ASYNC, DEFAULT_IO_TIMEOUT);
+			memalloc_retry_wait(GFP_NOFS);
 			gfp_flags |= __GFP_NOFAIL;
 			goto retry_encrypt;
 		}