[patch 07/12] xfs: add xlog_grant_head_init

[Ben Myers]

Add xlog_grant_head_init() to initialize xlog_grant_head structures,
replacing the duplicated code in xlog_alloc_log.

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

On Mon, Dec 12, 2011 at 09:13:54AM -0500, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> 
> ---
>  fs/xfs/xfs_log.c |   18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> Index: xfs/fs/xfs/xfs_log.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_log.c	2011-12-11 21:24:39.502740565 +0100
> +++ xfs/fs/xfs/xfs_log.c	2011-12-11 21:28:15.334904636 +0100
> @@ -150,6 +150,15 @@ xlog_grant_add_space(
>  	} while (head_val != old);
>  }
>  
> +STATIC void
> +xlog_grant_head_init(
> +	struct xlog_grant_head	*head)
> +{
> +	xlog_assign_grant_head(&head->grant, 1, 0);
> +	INIT_LIST_HEAD(&head->waiters);
> +	spin_lock_init(&head->lock);
> +}
> +
>  STATIC bool
>  xlog_reserveq_wake(
>  	struct log		*log,
> @@ -1070,12 +1079,9 @@ xlog_alloc_log(xfs_mount_t	*mp,
>  	xlog_assign_atomic_lsn(&log->l_tail_lsn, 1, 0);
>  	xlog_assign_atomic_lsn(&log->l_last_sync_lsn, 1, 0);
>  	log->l_curr_cycle  = 1;	    /* 0 is bad since this is initial value */
> -	xlog_assign_grant_head(&log->l_reserve_head.grant, 1, 0);
> -	xlog_assign_grant_head(&log->l_write_head.grant, 1, 0);
> -	INIT_LIST_HEAD(&log->l_reserve_head.waiters);
> -	INIT_LIST_HEAD(&log->l_write_head.waiters);
> -	spin_lock_init(&log->l_reserve_head.lock);
> -	spin_lock_init(&log->l_write_head.lock);
> +
> +	xlog_grant_head_init(&log->l_reserve_head);
> +	xlog_grant_head_init(&log->l_write_head);
>  
>  	error = EFSCORRUPTED;
>  	if (xfs_sb_version_hassector(&mp->m_sb)) {
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs