Re: [PATCH 10/16] udf: create common function for changing free space counter

[Jan Kara <jack@suse.cz>]

On Thu 10-01-08 23:06:26, marcin.slusarz@gmail.com wrote:
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> CC: Jan Kara <jack@suse.cz>
> CC: Christoph Hellwig <hch@infradead.org>
  Just two minor comment...

> ---
>  fs/udf/balloc.c |   49 ++++++++++++++++++++-----------------------------
>  1 files changed, 20 insertions(+), 29 deletions(-)
> 
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index dc9f8a9..78dbf1d 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -140,6 +140,20 @@ static inline int load_block_bitmap(struct super_block *sb,
>  	return slot;
>  }
>  
> +static bool udf_inc_free_space(struct udf_sb_info *sbi,
  Maybe because you use the function for both increasing and decreasing
free space, you could call is udf_add_free_space?

> +				u16 partition, u32 cnt)
> +{
> +	struct logicalVolIntegrityDesc *lvid;
> +
> +	if (sbi->s_lvid_bh)
> +		return false;
> +
> +	lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> +	lvid->freeSpaceTable[partition] = cpu_to_le32(le32_to_cpu(
> +					lvid->freeSpaceTable[partition]) + cnt);
  I think macro like le32_add_cpu() just went into the kernel so you could
use that...

> +	return true;
> +}
> +
>  static void udf_bitmap_free_blocks(struct super_block *sb,
>  				   struct inode *inode,
>  				   struct udf_bitmap *bitmap,
> @@ -194,11 +208,7 @@ do_more:
>  		} else {
>  			if (inode)
>  				DQUOT_FREE_BLOCK(inode, 1);
> -			if (sbi->s_lvid_bh) {
> -				struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -				lvid->freeSpaceTable[sbi->s_partition] =
> -					cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[sbi->s_partition]) + 1);
> -			}
> +			udf_inc_free_space(sbi, sbi->s_partition, 1);
>  		}
>  	}
>  	mark_buffer_dirty(bh);
> @@ -268,12 +278,8 @@ repeat:
>  	if (block_count > 0)
>  		goto repeat;
>  out:
> -	if (sbi->s_lvid_bh) {
> -		struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -		lvid->freeSpaceTable[partition] =
> -			cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[partition]) - alloc_count);
> +	if (udf_inc_free_space(sbi, partition, -alloc_count))
>  		mark_buffer_dirty(sbi->s_lvid_bh);
> -	}
>  	sb->s_dirt = 1;
>  	mutex_unlock(&sbi->s_alloc_mutex);
>  	return alloc_count;
> @@ -404,12 +410,8 @@ got_block:
>  
>  	mark_buffer_dirty(bh);
>  
> -	if (sbi->s_lvid_bh) {
> -		struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -		lvid->freeSpaceTable[partition] =
> -			cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[partition]) - 1);
> +	if (udf_inc_free_space(sbi, partition, -1))
>  		mark_buffer_dirty(sbi->s_lvid_bh);
> -	}
>  	sb->s_dirt = 1;
>  	mutex_unlock(&sbi->s_alloc_mutex);
>  	*err = 0;
> @@ -450,12 +452,8 @@ static void udf_table_free_blocks(struct super_block *sb,
>  	   could occure, but.. oh well */
>  	if (inode)
>  		DQUOT_FREE_BLOCK(inode, count);
> -	if (sbi->s_lvid_bh) {
> -		struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -		lvid->freeSpaceTable[sbi->s_partition] =
> -			cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[sbi->s_partition]) + count);
> +	if (udf_inc_free_space(sbi, sbi->s_partition, count))
>  		mark_buffer_dirty(sbi->s_lvid_bh);
> -	}
>  
>  	start = bloc.logicalBlockNum + offset;
>  	end = bloc.logicalBlockNum + offset + count - 1;
> @@ -719,10 +717,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
>  
>  	brelse(epos.bh);
>  
> -	if (alloc_count && sbi->s_lvid_bh) {
> -		struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -		lvid->freeSpaceTable[partition] =
> -			cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[partition]) - alloc_count);
> +	if (alloc_count && udf_inc_free_space(sbi, partition, -alloc_count)) {
>  		mark_buffer_dirty(sbi->s_lvid_bh);
>  		sb->s_dirt = 1;
>  	}
> @@ -822,12 +817,8 @@ static int udf_table_new_block(struct super_block *sb,
>  		udf_delete_aext(table, goal_epos, goal_eloc, goal_elen);
>  	brelse(goal_epos.bh);
>  
> -	if (sbi->s_lvid_bh) {
> -		struct logicalVolIntegrityDesc *lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
> -		lvid->freeSpaceTable[partition] =
> -			cpu_to_le32(le32_to_cpu(lvid->freeSpaceTable[partition]) - 1);
> +	if (udf_inc_free_space(sbi, partition, -1))
>  		mark_buffer_dirty(sbi->s_lvid_bh);
> -	}
>  
>  	sb->s_dirt = 1;
>  	mutex_unlock(&sbi->s_alloc_mutex);

								Honza
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR