Merge tag 'gfs2-v5.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

	}

}

/**

 * drain_bd - drain the buf and databuf queue for a failed transaction

 * @tr: the transaction to drain

 *

 * When this is called, we're taking an error exit for a log write that failed

 * but since we bypassed the after_commit functions, we need to remove the

 * items from the buf and databuf queue.

 */

static void trans_drain(struct gfs2_trans *tr)

{

	struct gfs2_bufdata *bd;

	struct list_head *head;

	if (!tr)

		return;

	head = &tr->tr_buf;

	while (!list_empty(head)) {

		bd = list_first_entry(head, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);

		kmem_cache_free(gfs2_bufdata_cachep, bd);

	}

	head = &tr->tr_databuf;

	while (!list_empty(head)) {

		bd = list_first_entry(head, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);

		kmem_cache_free(gfs2_bufdata_cachep, bd);

	}

}

/**

 * gfs2_log_flush - flush incore transaction(s)

 * @sdp: the filesystem

out:

	if (gfs2_withdrawn(sdp)) {

		trans_drain(tr);

		/**

		 * If the tr_list is empty, we're withdrawing during a log

		 * flush that targets a transaction, but the transaction was

		tr->tr_reserved += gfs2_struct2blk(sdp, revokes);

	INIT_LIST_HEAD(&tr->tr_databuf);

	INIT_LIST_HEAD(&tr->tr_buf);

	INIT_LIST_HEAD(&tr->tr_list);

	INIT_LIST_HEAD(&tr->tr_ail1_list);

	INIT_LIST_HEAD(&tr->tr_ail2_list);