|
@@ -1614,7 +1614,7 @@ static inline bool f2fs_has_xattr_block(unsigned int ofs)
|
|
|
}
|
|
|
|
|
|
static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,
|
|
|
- struct inode *inode)
|
|
|
+ struct inode *inode, bool cap)
|
|
|
{
|
|
|
if (!inode)
|
|
|
return true;
|
|
@@ -1627,7 +1627,7 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,
|
|
|
if (!gid_eq(F2FS_OPTION(sbi).s_resgid, GLOBAL_ROOT_GID) &&
|
|
|
in_group_p(F2FS_OPTION(sbi).s_resgid))
|
|
|
return true;
|
|
|
- if (capable(CAP_SYS_RESOURCE))
|
|
|
+ if (cap && capable(CAP_SYS_RESOURCE))
|
|
|
return true;
|
|
|
return false;
|
|
|
}
|
|
@@ -1662,7 +1662,7 @@ static inline int inc_valid_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))
|
|
|
+ if (!__allow_reserved_blocks(sbi, inode, true))
|
|
|
avail_user_block_count -= F2FS_OPTION(sbi).root_reserved_blocks;
|
|
|
|
|
|
if (unlikely(sbi->total_valid_block_count > avail_user_block_count)) {
|
|
@@ -1869,7 +1869,7 @@ static inline int inc_valid_node_count(struct f2fs_sb_info *sbi,
|
|
|
valid_block_count = sbi->total_valid_block_count +
|
|
|
sbi->current_reserved_blocks + 1;
|
|
|
|
|
|
- if (!__allow_reserved_blocks(sbi, inode))
|
|
|
+ if (!__allow_reserved_blocks(sbi, inode, false))
|
|
|
valid_block_count += F2FS_OPTION(sbi).root_reserved_blocks;
|
|
|
|
|
|
if (unlikely(valid_block_count > sbi->user_block_count)) {
|