|
@@ -1440,14 +1440,14 @@ out:
|
|
|
*
|
|
|
* Check if filesystem has at least 1 free block available for allocation.
|
|
|
*/
|
|
|
-static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
|
|
|
+static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
|
|
|
{
|
|
|
ext3_fsblk_t free_blocks, root_blocks;
|
|
|
|
|
|
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
|
|
|
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
|
|
|
if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
|
|
|
- sbi->s_resuid != current_fsuid() &&
|
|
|
+ !use_reservation && sbi->s_resuid != current_fsuid() &&
|
|
|
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
|
|
|
return 0;
|
|
|
}
|
|
@@ -1468,7 +1468,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
|
|
|
*/
|
|
|
int ext3_should_retry_alloc(struct super_block *sb, int *retries)
|
|
|
{
|
|
|
- if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)
|
|
|
+ if (!ext3_has_free_blocks(EXT3_SB(sb), 0) || (*retries)++ > 3)
|
|
|
return 0;
|
|
|
|
|
|
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
|
|
@@ -1546,7 +1546,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
|
|
|
if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
|
|
|
my_rsv = &block_i->rsv_window_node;
|
|
|
|
|
|
- if (!ext3_has_free_blocks(sbi)) {
|
|
|
+ if (!ext3_has_free_blocks(sbi, IS_NOQUOTA(inode))) {
|
|
|
*errp = -ENOSPC;
|
|
|
goto out;
|
|
|
}
|