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

Commit c50b91c4 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Remove bd_list_tr 



This is another clean up in the logging code. This per-transaction
list was largely unused. Its main function was to ensure that the
number of buffers in a transaction was correct, however that counter
was only used to check the number of buffers in the bd_list_tr, plus
an assert at the end of each transaction. With the assert now changed
to use the calculated buffer counts, we can remove both bd_list_tr and
its associated counter.

This should make the code easier to understand as well as shrinking
a couple of structures.

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

fs/gfs2/aops.c

+0 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,6 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) 
		bd = bh->b_private;

		if (bd) {

			gfs2_assert_warn(sdp, bd->bd_bh == bh);

			gfs2_assert_warn(sdp, list_empty(&bd->bd_list_tr));

			if (!list_empty(&bd->bd_le.le_list)) {

				if (!buffer_pinned(bh))

					list_del_init(&bd->bd_le.le_list);

fs/gfs2/glops.c

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
	/* A shortened, inline version of gfs2_trans_begin() */

	tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));

	tr.tr_ip = (unsigned long)__builtin_return_address(0);

	INIT_LIST_HEAD(&tr.tr_list_buf);

	gfs2_log_reserve(sdp, tr.tr_reserved);

	BUG_ON(current->journal_info);

	current->journal_info = &tr;

fs/gfs2/incore.h

+1 −10
Original line number Diff line number Diff line
@@ -118,13 +118,7 @@ TAS_BUFFER_FNS(Zeronew, zeronew) 
struct gfs2_bufdata {

	struct buffer_head *bd_bh;

	struct gfs2_glock *bd_gl;



	union {

		struct list_head list_tr;

		u64 blkno;

	} u;

#define bd_list_tr u.list_tr

#define bd_blkno u.blkno

	u64 bd_blkno;



	struct gfs2_log_element bd_le;
@@ -411,13 +405,10 @@ struct gfs2_trans { 


	int tr_touched;



	unsigned int tr_num_buf;

	unsigned int tr_num_buf_new;

	unsigned int tr_num_databuf_new;

	unsigned int tr_num_buf_rm;

	unsigned int tr_num_databuf_rm;

	struct list_head tr_list_buf;



	unsigned int tr_num_revoke;

	unsigned int tr_num_revoke_rm;

};

fs/gfs2/log.c

+0 −17
Original line number Diff line number Diff line
@@ -696,21 +696,6 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
	gfs2_log_unlock(sdp);

}



static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	struct list_head *head = &tr->tr_list_buf;

	struct gfs2_bufdata *bd;



	gfs2_log_lock(sdp);

	while (!list_empty(head)) {

		bd = list_entry(head->next, struct gfs2_bufdata, bd_list_tr);

		list_del_init(&bd->bd_list_tr);

		tr->tr_num_buf--;

	}

	gfs2_log_unlock(sdp);

	gfs2_assert_warn(sdp, !tr->tr_num_buf);

}



/**

 * gfs2_log_commit - Commit a transaction to the log

 * @sdp: the filesystem
@@ -729,8 +714,6 @@ static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	log_refund(sdp, tr);

	buf_lo_incore_commit(sdp, tr);



	up_read(&sdp->sd_log_flush_lock);



	if (atomic_read(&sdp->sd_log_pinned) > atomic_read(&sdp->sd_log_thresh1) ||

fs/gfs2/lops.c

+1 −13
Original line number Diff line number Diff line
@@ -396,12 +396,8 @@ static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le) 


	lock_buffer(bd->bd_bh);

	gfs2_log_lock(sdp);

	if (!list_empty(&bd->bd_list_tr))

		goto out;

	tr = current->journal_info;

	tr->tr_touched = 1;

	tr->tr_num_buf++;

	list_add(&bd->bd_list_tr, &tr->tr_list_buf);

	if (!list_empty(&le->le_list))

		goto out;

	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
@@ -781,18 +777,10 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le) 


	lock_buffer(bd->bd_bh);

	gfs2_log_lock(sdp);

	if (tr) {

		if (!list_empty(&bd->bd_list_tr))

			goto out;

	if (tr)

		tr->tr_touched = 1;

		if (gfs2_is_jdata(ip)) {

			tr->tr_num_buf++;

			list_add(&bd->bd_list_tr, &tr->tr_list_buf);

		}

	}

	if (!list_empty(&le->le_list))

		goto out;



	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);

	set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);

	if (gfs2_is_jdata(ip)) {