Commit 10866892 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Move gfs2_remove_from_journal to log.c 



Move gfs2_remove_from_journal() from meta_io.c to log.c and fix a minor
indentation glitch.

With that, gfs2_remove_from_ail() is now only used inside log.c, so it
can be made static.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 5a15907f

fs/gfs2/log.c

+36 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct) 
 *

 */



void gfs2_remove_from_ail(struct gfs2_bufdata *bd)

static void gfs2_remove_from_ail(struct gfs2_bufdata *bd)

{

	bd->bd_tr = NULL;

	list_del_init(&bd->bd_ail_st_list);
@@ -1017,6 +1017,41 @@ static void trans_drain(struct gfs2_trans *tr) 
	}

}



void gfs2_remove_from_journal(struct buffer_head *bh, int meta)

{

	struct address_space *mapping = bh->b_folio->mapping;

	struct gfs2_sbd *sdp = gfs2_mapping2sbd(mapping);

	struct gfs2_bufdata *bd = bh->b_private;

	struct gfs2_trans *tr = current->journal_info;

	int was_pinned = 0;



	if (test_clear_buffer_pinned(bh)) {

		trace_gfs2_pin(bd, 0);

		atomic_dec(&sdp->sd_log_pinned);

		list_del_init(&bd->bd_list);

		if (meta == REMOVE_META)

			tr->tr_num_buf_rm++;

		else

			tr->tr_num_databuf_rm++;

		set_bit(TR_TOUCHED, &tr->tr_flags);

		was_pinned = 1;

		brelse(bh);

	}

	if (bd) {

		if (bd->bd_tr) {

			gfs2_trans_add_revoke(sdp, bd);

		} else if (was_pinned) {

			bh->b_private = NULL;

			kmem_cache_free(gfs2_bufdata_cachep, bd);

		} else if (!list_empty(&bd->bd_ail_st_list) &&

			   !list_empty(&bd->bd_ail_gl_list)) {

			gfs2_remove_from_ail(bd);

		}

	}

	clear_buffer_dirty(bh);

	clear_buffer_uptodate(bh);

}



/**

 * gfs2_log_flush - flush incore transaction(s)

 * @sdp: The filesystem

fs/gfs2/log.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip) 


void gfs2_ordered_del_inode(struct gfs2_inode *ip);

unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct);

void gfs2_remove_from_ail(struct gfs2_bufdata *bd);

bool gfs2_log_is_empty(struct gfs2_sbd *sdp);

void gfs2_log_release_revokes(struct gfs2_sbd *sdp, unsigned int revokes);

void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks);
@@ -48,6 +47,7 @@ void gfs2_log_reserve(struct gfs2_sbd *sdp, struct gfs2_trans *tr, 
void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,

			   u64 seq, u32 tail, u32 lblock, u32 flags,

			   blk_opf_t op_flags);

void gfs2_remove_from_journal(struct buffer_head *bh, int meta);

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

		    u32 type);

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

fs/gfs2/meta_io.c

+0 −35
Original line number Diff line number Diff line
@@ -338,41 +338,6 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh) 
	return 0;

}



void gfs2_remove_from_journal(struct buffer_head *bh, int meta)

{

	struct address_space *mapping = bh->b_folio->mapping;

	struct gfs2_sbd *sdp = gfs2_mapping2sbd(mapping);

	struct gfs2_bufdata *bd = bh->b_private;

	struct gfs2_trans *tr = current->journal_info;

	int was_pinned = 0;



	if (test_clear_buffer_pinned(bh)) {

		trace_gfs2_pin(bd, 0);

		atomic_dec(&sdp->sd_log_pinned);

		list_del_init(&bd->bd_list);

		if (meta == REMOVE_META)

			tr->tr_num_buf_rm++;

		else

			tr->tr_num_databuf_rm++;

		set_bit(TR_TOUCHED, &tr->tr_flags);

		was_pinned = 1;

		brelse(bh);

	}

	if (bd) {

		if (bd->bd_tr) {

			gfs2_trans_add_revoke(sdp, bd);

		} else if (was_pinned) {

			bh->b_private = NULL;

			kmem_cache_free(gfs2_bufdata_cachep, bd);

		} else if (!list_empty(&bd->bd_ail_st_list) &&

					!list_empty(&bd->bd_ail_gl_list)) {

			gfs2_remove_from_ail(bd);

		}

	}

	clear_buffer_dirty(bh);

	clear_buffer_uptodate(bh);

}



/**

 * gfs2_ail1_wipe - remove deleted/freed buffers from the ail1 list

 * @sdp: superblock

fs/gfs2/meta_io.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ enum { 
	REMOVE_META = 1,

};



void gfs2_remove_from_journal(struct buffer_head *bh, int meta);

void gfs2_journal_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen);

int gfs2_meta_buffer(struct gfs2_inode *ip, u32 mtype, u64 num,

		     struct buffer_head **bhp);