Skip to contentSkip to conversation

f2fs: fix condition in __allow_reserved_blocks()

PATCH Applied Chao Yu 2 participants 2 messages Jul 31, 2025 – Aug 15, 2025 F2FS file system

lore
Share & tools
lore

Chao Yu

author maintainer
#0 lore raw

PATCH 1/1 f2fs: fix condition in __allow_reserved_blocks()

If reserve_root mount option is not assigned, __allow_reserved_blocks() will return false, it's not correct, fix it.

Fixes 7e65be49ed94 ("f2fs: add reserved blocks for root user")
---
 fs/f2fs/f2fs.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/f2fs/f2fs.h +1 -3
index 691af2a6c159..c40ff0c6796e 100644
@@ -2396,8 +2396,6 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,
 {
 	if (!inode)
 		return true;
-	if (!test_opt(sbi, RESERVE_ROOT))
-		return false;
 	if (IS_NOQUOTA(inode))
 		return true;
 	if (uid_eq(F2FS_OPTION(sbi).s_resuid, current_fsuid()))
@@ -2418,7 +2416,7 @@ static inline unsigned int get_available_block_count(struct f2fs_sb_info *sbi,
 	avail_user_block_count = sbi->user_block_count -
 					sbi->current_reserved_blocks;
 
-	if (!__allow_reserved_blocks(sbi, inode, cap))
+	if (test_opt(sbi, RESERVE_ROOT) && !__allow_reserved_blocks(sbi, inode, cap))
 		avail_user_block_count -= F2FS_OPTION(sbi).root_reserved_blocks;
 
 	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
Signature · 1 line
2.49.0
#1 lore raw
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:

Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:

Quoted 8 lines · On Thu, 31 Jul 2025 14:03:38 +0800 you wrote:

If reserve_root mount option is not assigned, __allow_reserved_blocks() will return false, it's not correct, fix it.

Fixes 7e65be49ed94 ("f2fs: add reserved blocks for root user")
---
 fs/f2fs/f2fs.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Here is the summary with links:
- [f2fs-dev] f2fs: fix condition in __allow_reserved_blocks()

    https://git.kernel.org/jaegeuk/f2fs/c/e75ce117905d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html