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

Commit 1e1a3d03 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Introduce gfs2_remove_from_ail 



This collects together the operations required to remove a gfs2_bufdata
from the ail lists. Its only called from two places to start with, but
expect to see more of this function in future.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 8497a46e

fs/gfs2/glops.c

+1 −5
Original line number Diff line number Diff line
@@ -60,11 +60,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
		blkno = bh->b_blocknr;

		gfs2_assert_withdraw(sdp, !buffer_busy(bh));



		bd->bd_ail = NULL;

		list_del(&bd->bd_ail_st_list);

		list_del(&bd->bd_ail_gl_list);

		atomic_dec(&gl->gl_ail_count);

		brelse(bh);

		gfs2_remove_from_ail(NULL, bd);

		gfs2_log_unlock(sdp);



		gfs2_trans_add_revoke(sdp, blkno);

fs/gfs2/log.c

+21 −10
Original line number Diff line number Diff line
@@ -59,6 +59,26 @@ unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct, 
	return blks;

}



/**

 * gfs2_remove_from_ail - Remove an entry from the ail lists, updating counters

 * @mapping: The associated mapping (maybe NULL)

 * @bd: The gfs2_bufdata to remove

 *

 * The log lock _must_ be held when calling this function

 *

 */



void gfs2_remove_from_ail(struct address_space *mapping, struct gfs2_bufdata *bd)

{

	bd->bd_ail = NULL;

	list_del(&bd->bd_ail_st_list);

	list_del(&bd->bd_ail_gl_list);

	atomic_dec(&bd->bd_gl->gl_ail_count);

	if (mapping)

		gfs2_meta_cache_flush(GFS2_I(mapping->host));

	brelse(bd->bd_bh);

}



/**

 * gfs2_ail1_start_one - Start I/O on a part of the AIL

 * @sdp: the filesystem
@@ -219,21 +239,12 @@ static void gfs2_ail2_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai) 
{

	struct list_head *head = &ai->ai_ail2_list;

	struct gfs2_bufdata *bd;

	struct gfs2_inode *bh_ip;



	while (!list_empty(head)) {

		bd = list_entry(head->prev, struct gfs2_bufdata,

				bd_ail_st_list);

		gfs2_assert(sdp, bd->bd_ail == ai);

		bd->bd_ail = NULL;

		list_del(&bd->bd_ail_st_list);

		list_del(&bd->bd_ail_gl_list);

		atomic_dec(&bd->bd_gl->gl_ail_count);

		if (bd->bd_bh->b_page->mapping) {

			bh_ip = GFS2_I(bd->bd_bh->b_page->mapping->host);

			gfs2_meta_cache_flush(bh_ip);

		}

		brelse(bd->bd_bh);

		gfs2_remove_from_ail(bd->bd_bh->b_page->mapping, bd);

	}

}

fs/gfs2/log.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct buffer_head *gfs2_log_fake_buf(struct gfs2_sbd *sdp, 
				      struct buffer_head *real);

void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl);

void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *trans);

void gfs2_remove_from_ail(struct address_space *mapping, struct gfs2_bufdata *bd);



void gfs2_log_shutdown(struct gfs2_sbd *sdp);

void gfs2_meta_syncfs(struct gfs2_sbd *sdp);