Re: [PATCH] quota: convert dquot_claim_space_nodirty() to return void

[Jan Kara]

On Sun 10-12-23 10:50:28, Chao Yu wrote:
> dquot_claim_space_nodirty() always return zero, let's convert it
> to return void, then, its caller can get rid of handling failure
> case.
> 
> Signed-off-by: Chao Yu <chao@xxxxxxxxxx>

Nice. I've added the patch to my tree. Thanks!

								Honza

> ---
>  fs/quota/dquot.c         |  6 +++---
>  include/linux/quotaops.h | 15 +++++----------
>  2 files changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index 58b5de081b57..44ff2813ae51 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -1787,7 +1787,7 @@ EXPORT_SYMBOL(dquot_alloc_inode);
>  /*
>   * Convert in-memory reserved quotas to real consumed quotas
>   */
> -int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> +void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
>  {
>  	struct dquot **dquots;
>  	int cnt, index;
> @@ -1797,7 +1797,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
>  		*inode_reserved_space(inode) -= number;
>  		__inode_add_bytes(inode, number);
>  		spin_unlock(&inode->i_lock);
> -		return 0;
> +		return;
>  	}
>  
>  	dquots = i_dquot(inode);
> @@ -1822,7 +1822,7 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
>  	spin_unlock(&inode->i_lock);
>  	mark_all_dquot_dirty(dquots);
>  	srcu_read_unlock(&dquot_srcu, index);
> -	return 0;
> +	return;
>  }
>  EXPORT_SYMBOL(dquot_claim_space_nodirty);
>  
> diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
> index 4fa4ef0a173a..06cc8888199e 100644
> --- a/include/linux/quotaops.h
> +++ b/include/linux/quotaops.h
> @@ -74,7 +74,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags);
>  
>  int dquot_alloc_inode(struct inode *inode);
>  
> -int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
> +void dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
>  void dquot_free_inode(struct inode *inode);
>  void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number);
>  
> @@ -257,10 +257,9 @@ static inline void __dquot_free_space(struct inode *inode, qsize_t number,
>  		inode_sub_bytes(inode, number);
>  }
>  
> -static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
> +static inline void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
>  {
>  	inode_add_bytes(inode, number);
> -	return 0;
>  }
>  
>  static inline int dquot_reclaim_space_nodirty(struct inode *inode,
> @@ -358,14 +357,10 @@ static inline int dquot_reserve_block(struct inode *inode, qsize_t nr)
>  				DQUOT_SPACE_WARN|DQUOT_SPACE_RESERVE);
>  }
>  
> -static inline int dquot_claim_block(struct inode *inode, qsize_t nr)
> +static inline void dquot_claim_block(struct inode *inode, qsize_t nr)
>  {
> -	int ret;
> -
> -	ret = dquot_claim_space_nodirty(inode, nr << inode->i_blkbits);
> -	if (!ret)
> -		mark_inode_dirty_sync(inode);
> -	return ret;
> +	dquot_claim_space_nodirty(inode, nr << inode->i_blkbits);
> +	mark_inode_dirty_sync(inode);
>  }
>  
>  static inline void dquot_reclaim_block(struct inode *inode, qsize_t nr)
> -- 
> 2.40.1
> 
-- 
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR