lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: rename ext4_claim_free_blocks() to ext4_claim_free_clusters()

Browse Source 
This function really claims a number of free clusters, not blocks, so
rename it so it's clearer what's going on.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2011-09-09 19:14:51 -04:00
parent cff1dfd767
commit e7d5f3156e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ext4/balloc.c
View File

@@ -445,11 +445,11 @@ static int ext4_has_free_blocks(struct ext4_sb_info *sbi,
return 0; return 0;
} }
int ext4_claim_free_blocks(struct ext4_sb_info *sbi, int ext4_claim_free_clusters(struct ext4_sb_info *sbi,
s64 nblocks, unsigned int flags) s64 nclusters, unsigned int flags)
{ {
if (ext4_has_free_blocks(sbi, nblocks, flags)) { if (ext4_has_free_blocks(sbi, nclusters, flags)) {
percpu_counter_add(&sbi->s_dirtyclusters_counter, nblocks); percpu_counter_add(&sbi->s_dirtyclusters_counter, nclusters);
return 0; return 0;
} else } else
return -ENOSPC; return -ENOSPC;

4
fs/ext4/ext4.h
View File

@@ -1773,8 +1773,8 @@ extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode,
unsigned int flags, unsigned int flags,
unsigned long *count, unsigned long *count,
int *errp); int *errp);
extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi, extern int ext4_claim_free_clusters(struct ext4_sb_info *sbi,
s64 nblocks, unsigned int flags); s64 nclusters, unsigned int flags);
extern ext4_fsblk_t ext4_count_free_clusters(struct super_block *); extern ext4_fsblk_t ext4_count_free_clusters(struct super_block *);
extern void ext4_check_blocks_bitmap(struct super_block *); extern void ext4_check_blocks_bitmap(struct super_block *);
extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb, extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,

2
fs/ext4/inode.c
View File

@@ -1071,7 +1071,7 @@ repeat:
* We do still charge estimated metadata to the sb though; * We do still charge estimated metadata to the sb though;
* we cannot afford to run out of free blocks. * we cannot afford to run out of free blocks.
*/ */
if (ext4_claim_free_blocks(sbi, md_needed + 1, 0)) { if (ext4_claim_free_clusters(sbi, md_needed + 1, 0)) {
dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1)); dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));
if (ext4_should_retry_alloc(inode->i_sb, &retries)) { if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
yield(); yield();

2
fs/ext4/mballoc.c
View File

@@ -4297,7 +4297,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
* and verify allocation doesn't exceed the quota limits. * and verify allocation doesn't exceed the quota limits.
*/ */
while (ar->len && while (ar->len &&
ext4_claim_free_blocks(sbi, ar->len, ar->flags)) { ext4_claim_free_clusters(sbi, ar->len, ar->flags)) {
/* let others to free the space */ /* let others to free the space */
yield(); yield();