Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe6c991c authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

[GFS2] Get rid of unneeded parameter in gfs2_rlist_alloc 



This patch removed the unnecessary parameter from function
gfs2_rlist_alloc.  The parameter was always passed in as 0.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ecc30c79

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,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;

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/gfs2/eattr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/gfs2/rgrp.c

+3 −4
Original line number Diff line number Diff line 
/*

 * 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]);

}

fs/gfs2/rgrp.h

+2 −3
Original line number Diff line number Diff line 
/*

 * 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);