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

Commit 8381e602 authored by Bob Peterson's avatar Bob Peterson
Browse files

GFS2: Remove allocation parms from gfs2_rbm_find 



Struct gfs2_alloc_parms ap is never referenced in function
gfs2_rbm_find, so this patch removes it.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 80f4781d

fs/gfs2/rgrp.c

+6 −10
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ static const char valid_change[16] = { 
};



static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext,

			 const struct gfs2_inode *ip, bool nowrap,

			 const struct gfs2_alloc_parms *ap);

			 const struct gfs2_inode *ip, bool nowrap);





/**
@@ -1512,7 +1511,7 @@ static void rg_mblk_search(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip, 
	if (WARN_ON(gfs2_rbm_from_block(&rbm, goal)))

		return;



	ret = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &extlen, ip, true, ap);

	ret = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &extlen, ip, true);

	if (ret == 0) {

		rs->rs_rbm = rbm;

		rs->rs_free = extlen;
@@ -1639,7 +1638,6 @@ static int gfs2_reservation_check_and_update(struct gfs2_rbm *rbm, 
 * @ip: If set, check for reservations

 * @nowrap: Stop looking at the end of the rgrp, rather than wrapping

 *          around until we've reached the starting point.

 * @ap: the allocation parameters

 *

 * Side effects:

 * - If looking for free blocks, we set GBF_FULL on each bitmap which
@@ -1651,8 +1649,7 @@ static int gfs2_reservation_check_and_update(struct gfs2_rbm *rbm, 
 */



static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext,

			 const struct gfs2_inode *ip, bool nowrap,

			 const struct gfs2_alloc_parms *ap)

			 const struct gfs2_inode *ip, bool nowrap)

{

	struct buffer_head *bh;

	int initial_bii;
@@ -1773,7 +1770,7 @@ static void try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked, u64 skip 
	while (1) {

		down_write(&sdp->sd_log_flush_lock);

		error = gfs2_rbm_find(&rbm, GFS2_BLKST_UNLINKED, NULL, NULL,

				      true, NULL);

				      true);

		up_write(&sdp->sd_log_flush_lock);

		if (error == -ENOSPC)

			break;
@@ -2330,12 +2327,11 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, 
	int error;



	gfs2_set_alloc_start(&rbm, ip, dinode);

	error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, ip, false, NULL);

	error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, ip, false);



	if (error == -ENOSPC) {

		gfs2_set_alloc_start(&rbm, ip, dinode);

		error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, NULL, false,

				      NULL);

		error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, NULL, false);

	}



	/* Since all blocks are reserved in advance, this shouldn't happen */