From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Chao Yu <chao@kernel.org>, Jaegeuk Kim <jaegeuk@kernel.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.18.y 1/5] f2fs: use memalloc_retry_wait() as much as possible
Date: Sat, 4 Jul 2026 09:01:02 -0400 [thread overview]
Message-ID: <20260704130106.828918-1-sashal@kernel.org> (raw)
In-Reply-To: <2026070234-outdated-refutable-f834@gregkh>
From: Chao Yu <chao@kernel.org>
[ Upstream commit 30a8496694f1a93328e5d7f19206380346918b5a ]
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>
Stable-dep-of: 8712353ed80f ("f2fs: fix to do sanity check on f2fs_get_node_folio_ra()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/f2fs/segment.c | 2 +-
fs/f2fs/super.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index a7cf8627d88811..4739decfc88863 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -234,7 +234,7 @@ static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,
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 9154f702e1706a..fc4a2e915ca09a 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3128,7 +3128,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,
&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);
--
2.53.0
next prev parent reply other threads:[~2026-07-04 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-02 13:36 FAILED: patch "[PATCH] f2fs: fix to do sanity check on f2fs_get_node_folio_ra()" failed to apply to 6.18-stable tree gregkh
2026-07-04 13:01 ` Sasha Levin [this message]
2026-07-04 13:01 ` [PATCH 6.18.y 2/5] f2fs: introduce f2fs_schedule_timeout() Sasha Levin
2026-07-04 13:01 ` [PATCH 6.18.y 3/5] f2fs: optimize trace_f2fs_write_checkpoint with enums Sasha Levin
2026-07-04 13:01 ` [PATCH 6.18.y 4/5] f2fs: detect more inconsistent cases in sanity_check_node_footer() Sasha Levin
2026-07-04 13:01 ` [PATCH 6.18.y 5/5] f2fs: fix to do sanity check on f2fs_get_node_folio_ra() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260704130106.828918-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=chao@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox