Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d5f315 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: rename ext4_claim_free_blocks() to ext4_claim_free_clusters() 



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: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent cff1dfd7

fs/ext4/balloc.c

+4 −4
Original line number Diff line number Diff line
@@ -445,11 +445,11 @@ static int ext4_has_free_blocks(struct ext4_sb_info *sbi, 
	return 0;

}



int ext4_claim_free_blocks(struct ext4_sb_info *sbi,

			   s64 nblocks, unsigned int flags)

int ext4_claim_free_clusters(struct ext4_sb_info *sbi,

			     s64 nclusters, unsigned int flags)

{

	if (ext4_has_free_blocks(sbi, nblocks, flags)) {

		percpu_counter_add(&sbi->s_dirtyclusters_counter, nblocks);

	if (ext4_has_free_blocks(sbi, nclusters, flags)) {

		percpu_counter_add(&sbi->s_dirtyclusters_counter, nclusters);

		return 0;

	} else

		return -ENOSPC;

fs/ext4/ext4.h

+2 −2
Original line number Diff line number Diff line
@@ -1773,8 +1773,8 @@ extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, 
					 unsigned int flags,

					 unsigned long *count,

					 int *errp);

extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi,

				  s64 nblocks, unsigned int flags);

extern int ext4_claim_free_clusters(struct ext4_sb_info *sbi,

				    s64 nclusters, unsigned int flags);

extern ext4_fsblk_t ext4_count_free_clusters(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,

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock) 
	 * We do still charge estimated metadata to the sb though;

	 * 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));

		if (ext4_should_retry_alloc(inode->i_sb, &retries)) {

			yield();

fs/ext4/mballoc.c

+1 −1
Original line number Diff line number Diff line
@@ -4297,7 +4297,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, 
		 * and verify allocation doesn't exceed the quota limits.

		 */

		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 */

			yield();