diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2011-10-19 14:16:23 +0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2011-10-31 23:43:59 +0100 |
| commit | 6360e21f943172bb71772ec150b96a9e787a535f (patch) | |
| tree | 20eaacab68cf2c9644a4cb0ff2bd03d66761c0aa /fs/ext3 | |
| parent | 23cc94eaea4436d37c0b7f1f264a319e8f11088f (diff) | |
| download | linux-3.10-6360e21f943172bb71772ec150b96a9e787a535f.tar.gz linux-3.10-6360e21f943172bb71772ec150b96a9e787a535f.tar.bz2 linux-3.10-6360e21f943172bb71772ec150b96a9e787a535f.zip | |
ext3: Allow quota file use root reservation
Quota file is fs's metadata, so it is reasonable to permit use
root resevation if necessary. This patch fix 265'th xfstest failure
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/balloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index a7fceaba87f..a2038928f9a 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c @@ -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; } |