From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 Jan 2008 08:30:09 +0000
Subject: [Cluster-devel] [GFS2 PATCH] Get rid of unneeded parameter in
	gfs2_rlist_alloc
In-Reply-To: <1201540382.18461.74.camel@technetium.msp.redhat.com>
References: <1201540382.18461.74.camel@technetium.msp.redhat.com>
Message-ID: <1201595409.22038.314.camel@quoit>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Now in the -nmw tree. Thanks,

Steve.

On Mon, 2008-01-28 at 11:13 -0600, Bob Peterson wrote:
> Hi,
> 
> This patch removed the unnecessary parameter from function
> gfs2_rlist_alloc.  The parameter was always passed in as 0.
> 
> Regards,
> 
> Bob Peterson
> Red Hat GFS
> 
> Signed-off-by: Bob Peterson <rpeterso@redhat.com> 
> --
>  fs/gfs2/bmap.c        |    1 +-
>  fs/gfs2/dir.c         |    2 +-
>  fs/gfs2/eattr.c       |    2 +-
>  fs/gfs2/rgrp.c        |    7 +++----
>  fs/gfs2/rgrp.h        |    5 ++---
>  5 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
> index 2a90084..359231e 100644
> --- a/fs/gfs2/bmap.c
> +++ b/fs/gfs2/bmap.c
> @@ -680,7 +679,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
>  	else
>  		goto out; /* Nothing to do */
>  
> -	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, 0);
> +	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);
>  
>  	for (x = 0; x < rlist.rl_rgrps; x++) {
>  		struct gfs2_rgrpd *rgd;
> diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
> index 57e2ed9..165f295 100644
> --- a/fs/gfs2/dir.c
> +++ b/fs/gfs2/dir.c
> @@ -1894,7 +1894,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
>  		l_blocks++;
>  	}
>  
> -	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, 0);
> +	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);
>  
>  	for (x = 0; x < rlist.rl_rgrps; x++) {
>  		struct gfs2_rgrpd *rgd;
> diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
> index bee9970..04febbc 100644
> --- a/fs/gfs2/eattr.c
> +++ b/fs/gfs2/eattr.c
> @@ -1347,7 +1347,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
>  	else
>  		goto out;
>  
> -	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, 0);
> +	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);
>  
>  	for (x = 0; x < rlist.rl_rgrps; x++) {
>  		struct gfs2_rgrpd *rgd;
> diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
> index 3552110..7b9d6f1 100644
> --- a/fs/gfs2/rgrp.c
> +++ b/fs/gfs2/rgrp.c
> @@ -1,6 +1,6 @@
>  /*
>   * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
> - * Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
> + * Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
>   *
>   * This copyrighted material is made available to anyone wishing to use,
>   * modify, copy, or redistribute it subject to the terms and conditions
> @@ -1699,8 +1699,7 @@ void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist,
>   *
>   */
>  
> -void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state,
> -		      int flags)
> +void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state)
>  {
>  	unsigned int x;
>  
> @@ -1708,7 +1707,7 @@ void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state,
>  				GFP_NOFS | __GFP_NOFAIL);
>  	for (x = 0; x < rlist->rl_rgrps; x++)
>  		gfs2_holder_init(rlist->rl_rgd[x]->rd_gl,
> -				state, flags,
> +				state, 0,
>  				&rlist->rl_ghs[x]);
>  }
>  
> diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
> index 149bb16..5683605 100644
> --- a/fs/gfs2/rgrp.h
> +++ b/fs/gfs2/rgrp.h
> @@ -1,6 +1,6 @@
>  /*
>   * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
> - * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
> + * Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
>   *
>   * This copyrighted material is made available to anyone wishing to use,
>   * modify, copy, or redistribute it subject to the terms and conditions
> @@ -64,8 +64,7 @@ struct gfs2_rgrp_list {
>  
>  void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist,
>  		    u64 block);
> -void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state,
> -		      int flags);
> +void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state);
>  void gfs2_rlist_free(struct gfs2_rgrp_list *rlist);
>  u64 gfs2_ri_total(struct gfs2_sbd *sdp);
>  
> 
>