[patch 17/19] xfs: merge xfs_qm_dqinit_core into the only caller

[Ben Myers]

On Tue, Dec 06, 2011 at 04:58:23PM -0500, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> Reviewed-by: Dave Chinner <dchinner at redhat.com>

Looks good.
Reviewed-by: Ben Myers <bpm at sgi.com>

> ---
>  fs/xfs/xfs_dquot.c |   27 +++++++--------------------
>  1 file changed, 7 insertions(+), 20 deletions(-)
> 
> Index: xfs/fs/xfs/xfs_dquot.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_dquot.c	2011-11-25 11:56:36.905143783 +0100
> +++ xfs/fs/xfs/xfs_dquot.c	2011-11-25 11:56:40.861789014 +0100
> @@ -154,24 +154,6 @@ xfs_qm_dqdestroy(
>  }
>  
>  /*
> - * This is what a 'fresh' dquot inside a dquot chunk looks like on disk.
> - */
> -STATIC void
> -xfs_qm_dqinit_core(
> -	xfs_dqid_t	id,
> -	uint		type,
> -	xfs_dqblk_t	*d)
> -{
> -	/*
> -	 * Caller has zero'd the entire dquot 'chunk' already.
> -	 */
> -	d->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
> -	d->dd_diskdq.d_version = XFS_DQUOT_VERSION;
> -	d->dd_diskdq.d_id = cpu_to_be32(id);
> -	d->dd_diskdq.d_flags = type;
> -}
> -
> -/*
>   * If default limits are in force, push them into the dquot now.
>   * We overwrite the dquot limits only if they are zero and this
>   * is not the root dquot.
> @@ -327,8 +309,13 @@ xfs_qm_init_dquot_blk(
>  	curid = id - (id % q->qi_dqperchunk);
>  	ASSERT(curid >= 0);
>  	memset(d, 0, BBTOB(q->qi_dqchunklen));
> -	for (i = 0; i < q->qi_dqperchunk; i++, d++, curid++)
> -		xfs_qm_dqinit_core(curid, type, d);
> +	for (i = 0; i < q->qi_dqperchunk; i++, d++, curid++) {
> +		d->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
> +		d->dd_diskdq.d_version = XFS_DQUOT_VERSION;
> +		d->dd_diskdq.d_id = cpu_to_be32(curid);
> +		d->dd_diskdq.d_flags = type;
> +	}
> +
>  	xfs_trans_dquot_buf(tp, bp,
>  			    (type & XFS_DQ_USER ? XFS_BLF_UDQUOT_BUF :
>  			    ((type & XFS_DQ_PROJ) ? XFS_BLF_PDQUOT_BUF :
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs