[1/3] quota: use flags interface for dquot alloc/free space

Switch __dquot_alloc_space and __dquot_free_space to take flags
to indicate whether to warn and/or to reserve (or free reserve).

This is slightly more readable at the callpoints, and makes it
cleaner to add a "nofail" option in the next patch.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---


--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

> Switch __dquot_alloc_space and __dquot_free_space to take flags
> to indicate whether to warn and/or to reserve (or free reserve).
> 
> This is slightly more readable at the callpoints, and makes it
> cleaner to add a "nofail" option in the next patch.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
  Looks good. Acked-by: Jan Kara <jack@suse.cz>

> ---
> 
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index e0b870f..8436d9b 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -1484,11 +1484,12 @@ static void inode_decr_space(struct inode *inode, qsize_t number, int reserve)
>  /*
>   * This operation can block, but only after everything is updated
>   */
> -int __dquot_alloc_space(struct inode *inode, qsize_t number,
> -		int warn, int reserve)
> +int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
>  {
>  	int cnt, ret = 0;
>  	char warntype[MAXQUOTAS];
> +	int warn = flags & DQUOT_SPACE_WARN;
> +	int reserve = flags & DQUOT_SPACE_RESERVE;
>  
>  	/*
>  	 * First test before acquiring mutex - solves deadlocks when we
> @@ -1608,10 +1609,11 @@ EXPORT_SYMBOL(dquot_claim_space_nodirty);
>  /*
>   * This operation can block, but only after everything is updated
>   */
> -void __dquot_free_space(struct inode *inode, qsize_t number, int reserve)
> +void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
>  {
>  	unsigned int cnt;
>  	char warntype[MAXQUOTAS];
> +	int reserve = flags & DQUOT_SPACE_RESERVE;
>  
>  	/* First test before acquiring mutex - solves deadlocks when we
>           * re-enter the quota code and are already holding the mutex */
> diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
> index e6fa7ac..daa106f 100644
> --- a/include/linux/quotaops.h
> +++ b/include/linux/quotaops.h
> @@ -14,6 +14,9 @@ static inline struct quota_info *sb_dqopt(struct super_block *sb)
>  	return &sb->s_dquot;
>  }
>  
> +#define DQUOT_SPACE_WARN	0x1
> +#define DQUOT_SPACE_RESERVE	0x2
> +
>  #if defined(CONFIG_QUOTA)
>  
>  /*
> @@ -33,9 +36,8 @@ int dquot_scan_active(struct super_block *sb,
>  struct dquot *dquot_alloc(struct super_block *sb, int type);
>  void dquot_destroy(struct dquot *dquot);
>  
> -int __dquot_alloc_space(struct inode *inode, qsize_t number,
> -		int warn, int reserve);
> -void __dquot_free_space(struct inode *inode, qsize_t number, int reserve);
> +int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags);
> +void __dquot_free_space(struct inode *inode, qsize_t number, int flags);
>  
>  int dquot_alloc_inode(const struct inode *inode);
>  
> @@ -231,17 +233,17 @@ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
>  }
>  
>  static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
> -		int warn, int reserve)
> +		int flags)
>  {
> -	if (!reserve)
> +	if (!(flags & DQUOT_SPACE_RESERVE))
>  		inode_add_bytes(inode, number);
>  	return 0;
>  }
>  
>  static inline void __dquot_free_space(struct inode *inode, qsize_t number,
> -		int reserve)
> +		int flags)
>  {
> -	if (!reserve)
> +	if (!(flags & DQUOT_SPACE_RESERVE))
>  		inode_sub_bytes(inode, number);
>  }
>  
> @@ -257,7 +259,7 @@ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
>  
>  static inline int dquot_alloc_space_nodirty(struct inode *inode, qsize_t nr)
>  {
> -	return __dquot_alloc_space(inode, nr, 1, 0);
> +	return __dquot_alloc_space(inode, nr, DQUOT_SPACE_WARN);
>  }
>  
>  static inline int dquot_alloc_space(struct inode *inode, qsize_t nr)
> @@ -282,7 +284,7 @@ static inline int dquot_alloc_block(struct inode *inode, qsize_t nr)
>  
>  static inline int dquot_prealloc_block_nodirty(struct inode *inode, qsize_t nr)
>  {
> -	return __dquot_alloc_space(inode, nr << inode->i_blkbits, 0, 0);
> +	return __dquot_alloc_space(inode, nr << inode->i_blkbits, 0);
>  }
>  
>  static inline int dquot_prealloc_block(struct inode *inode, qsize_t nr)
> @@ -297,7 +299,8 @@ static inline int dquot_prealloc_block(struct inode *inode, qsize_t nr)
>  
>  static inline int dquot_reserve_block(struct inode *inode, qsize_t nr)
>  {
> -	return __dquot_alloc_space(inode, nr << inode->i_blkbits, 1, 1);
> +	return __dquot_alloc_space(inode, nr << inode->i_blkbits,
> +				DQUOT_SPACE_WARN|DQUOT_SPACE_RESERVE);
>  }
>  
>  static inline int dquot_claim_block(struct inode *inode, qsize_t nr)
> @@ -334,7 +337,7 @@ static inline void dquot_free_block(struct inode *inode, qsize_t nr)
>  static inline void dquot_release_reservation_block(struct inode *inode,
>  		qsize_t nr)
>  {
> -	__dquot_free_space(inode, nr << inode->i_blkbits, 1);
> +	__dquot_free_space(inode, nr << inode->i_blkbits, DQUOT_SPACE_RESERVE);
>  }
>  
>  #endif /* _LINUX_QUOTAOPS_ */
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Wed, Apr 07, 2010 at 04:49:05PM -0500, Eric Sandeen wrote:
> Switch __dquot_alloc_space and __dquot_free_space to take flags
> to indicate whether to warn and/or to reserve (or free reserve).
> 
> This is slightly more readable at the callpoints, and makes it
> cleaner to add a "nofail" option in the next patch.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Applied to the ext4 patch queue, apologies for the delay.

	       	    	  	 - Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html