Commit 6e80674a authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Clean up ail2_empty 



Clean up the logic in ail2_empty (no functional change).

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

fs/gfs2/log.c

+21 −17
Original line number Diff line number Diff line
@@ -367,22 +367,8 @@ static void gfs2_ail_empty_tr(struct gfs2_sbd *sdp, struct gfs2_trans *tr, 
	}

}



static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)

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

{

	struct gfs2_trans *tr, *safe;

	unsigned int old_tail = sdp->sd_log_tail;

	int wrap = (new_tail < old_tail);

	int a, b, rm;



	spin_lock(&sdp->sd_ail_lock);



	list_for_each_entry_safe(tr, safe, &sdp->sd_ail2_list, tr_list) {

		a = (old_tail <= tr->tr_first);

		b = (tr->tr_first < new_tail);

		rm = (wrap) ? (a || b) : (a && b);

		if (!rm)

			continue;



	gfs2_ail_empty_tr(sdp, tr, &tr->tr_ail2_list);

	list_del(&tr->tr_list);

	gfs2_assert_warn(sdp, list_empty(&tr->tr_ail1_list));
@@ -390,6 +376,24 @@ static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail) 
	gfs2_trans_free(sdp, tr);

}



static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)

{

	struct list_head *ail2_list = &sdp->sd_ail2_list;

	unsigned int old_tail = sdp->sd_log_tail;

	struct gfs2_trans *tr, *safe;



	spin_lock(&sdp->sd_ail_lock);

	if (old_tail <= new_tail) {

		list_for_each_entry_safe(tr, safe, ail2_list, tr_list) {

			if (old_tail <= tr->tr_first && tr->tr_first < new_tail)

				__ail2_empty(sdp, tr);

		}

	} else {

		list_for_each_entry_safe(tr, safe, ail2_list, tr_list) {

			if (old_tail <= tr->tr_first || tr->tr_first < new_tail)

				__ail2_empty(sdp, tr);

		}

	}

	spin_unlock(&sdp->sd_ail_lock);

}