f2fs: use memalloc_retry_wait() as much as possible

memalloc_retry_wait() is recommended in memory allocation retry logic,
use it as much as possible.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 10d873d1b328cd16ee38ed75b2531db919c50b52..d968a4250b1a5e590acf05970db0e108ffd26250 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -234,7 +234,7 @@ retry:
        err = f2fs_get_dnode_of_data(&dn, index, ALLOC_NODE);
        if (err) {
                if (err == -ENOMEM) {
-                       f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);
+                       memalloc_retry_wait(GFP_NOFS);
                        goto retry;
                }
                return err;

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index c2161b3469b37be5654a950ac42db7d719294223..2bd7c2320d4f05b76b2c949db032a7a95e1cc50d 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3139,7 +3139,7 @@ retry:
                                                        &folio, &fsdata);
                if (unlikely(err)) {
                        if (err == -ENOMEM) {
-                               f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);
+                               memalloc_retry_wait(GFP_NOFS);
                                goto retry;
                        }
                        set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);