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

[GFS2] Fix some bugs 



Fix a bug I introduced earlier with a kfree() and usage of
a structure in the wrong order. Also try and get the counts
of the journaled data buffers "more correct". Still some work
to do in this area though.

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

fs/gfs2/log.c

+0 −2
Original line number Diff line number Diff line
@@ -597,8 +597,6 @@ void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
	sdp->sd_vfs->s_dirt = 1;

	unlock_from_trans(sdp);



	kfree(tr);



	gfs2_log_lock(sdp);

	if (sdp->sd_log_num_buf > gfs2_tune_get(sdp, gt_incore_log_blocks)) {

		gfs2_log_unlock(sdp);

fs/gfs2/lops.c

+1 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le) 
		gfs2_trans_add_gl(bd->bd_gl);

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

		gfs2_pin(sdp, bd->bd_bh);

		tr->tr_num_buf_new++;

	}

	gfs2_log_lock(sdp);

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

fs/gfs2/trans.c

+6 −7
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ int gfs2_trans_begin_i(struct gfs2_sbd *sdp, unsigned int blocks, 
void gfs2_trans_end(struct gfs2_sbd *sdp)

{

	struct gfs2_trans *tr;

	struct gfs2_holder *t_gh;



	tr = current->journal_info;

	current->journal_info = NULL;
@@ -95,13 +94,11 @@ void gfs2_trans_end(struct gfs2_sbd *sdp) 
	if (gfs2_assert_warn(sdp, tr))

		return;



	t_gh = &tr->tr_t_gh;



	if (!tr->tr_touched) {

		gfs2_log_release(sdp, tr->tr_reserved);



		gfs2_glock_dq(t_gh);

		gfs2_holder_uninit(t_gh);

		gfs2_glock_dq(&tr->tr_t_gh);

		gfs2_holder_uninit(&tr->tr_t_gh);



		kfree(tr);

		return;
@@ -120,8 +117,10 @@ void gfs2_trans_end(struct gfs2_sbd *sdp) 


	gfs2_log_commit(sdp, tr);



	gfs2_glock_dq(t_gh);

	gfs2_holder_uninit(t_gh);

        gfs2_glock_dq(&tr->tr_t_gh);

        gfs2_holder_uninit(&tr->tr_t_gh);



        kfree(tr);



	if (sdp->sd_vfs->s_flags & MS_SYNCHRONOUS)

		gfs2_log_flush(sdp);