xfs: use internal dfops during [b|c]ui recovery (91ef75b6) · Commits · e / devices / android_kernel_teracube_emerald

fs/xfs/xfs_bmap_item.c

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,12 @@ xfs_bui_recover(
	XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp);		XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp);
	if (error)		if (error)
	return error;		return error;
	tp->t_dfops = dfops;		/*
			* Recovery stashes all deferred ops during intent processing and
			* finishes them on completion. Transfer current dfops state to this
			* transaction and transfer the result back before we return.
			*/
			xfs_defer_move(tp->t_dfops, dfops);
	budp = xfs_trans_get_bud(tp, buip);		budp = xfs_trans_get_bud(tp, buip);

	/* Grab the inode. */		/* Grab the inode. */
	@@ -470,7 +475,7 @@ xfs_bui_recover(
	xfs_trans_ijoin(tp, ip, 0);		xfs_trans_ijoin(tp, ip, 0);

	count = bmap->me_len;		count = bmap->me_len;
	error = xfs_trans_log_finish_bmap_update(tp, budp, dfops, type,		error = xfs_trans_log_finish_bmap_update(tp, budp, tp->t_dfops, type,
	ip, whichfork, bmap->me_startoff,		ip, whichfork, bmap->me_startoff,
	bmap->me_startblock, &count, state);		bmap->me_startblock, &count, state);
	if (error)		if (error)
	@@ -482,18 +487,14 @@ xfs_bui_recover(
	irec.br_blockcount = count;		irec.br_blockcount = count;
	irec.br_startoff = bmap->me_startoff;		irec.br_startoff = bmap->me_startoff;
	irec.br_state = state;		irec.br_state = state;
	error = xfs_bmap_unmap_extent(tp->t_mountp, dfops, ip, &irec);		error = xfs_bmap_unmap_extent(tp->t_mountp, tp->t_dfops, ip,
			&irec);
	if (error)		if (error)
	goto err_inode;		goto err_inode;
	}		}

	set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);		set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);
	/*		xfs_defer_move(dfops, tp->t_dfops);
	* Recovery finishes all deferred ops once intent processing is
	* complete. Reset the trans reference because commit expects a finished
	* dfops or none at all.
	*/
	tp->t_dfops = NULL;
	error = xfs_trans_commit(tp);		error = xfs_trans_commit(tp);
	xfs_iunlock(ip, XFS_ILOCK_EXCL);		xfs_iunlock(ip, XFS_ILOCK_EXCL);
	IRELE(ip);		IRELE(ip);
	@@ -501,7 +502,7 @@ xfs_bui_recover(
	return error;		return error;

	err_inode:		err_inode:
	tp->t_dfops = NULL;		xfs_defer_move(dfops, tp->t_dfops);
	xfs_trans_cancel(tp);		xfs_trans_cancel(tp);
	if (ip) {		if (ip) {
	xfs_iunlock(ip, XFS_ILOCK_EXCL);		xfs_iunlock(ip, XFS_ILOCK_EXCL);

fs/xfs/xfs_log_recover.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4854,10 +4854,10 @@ xlog_finish_defer_ops(
	0, XFS_TRANS_RESERVE, &tp);		0, XFS_TRANS_RESERVE, &tp);
	if (error)		if (error)
	return error;		return error;
	/* dfops is already populated so assign it manually */		/* transfer all collected dfops to this transaction */
	tp->t_dfops = dfops;		xfs_defer_move(tp->t_dfops, dfops);

	error = xfs_defer_finish(&tp, dfops);		error = xfs_defer_finish(&tp, tp->t_dfops);
	if (error)		if (error)
	goto out_cancel;		goto out_cancel;

fs/xfs/xfs_refcount_item.c

+16 −14

Original line number	Original line	Diff line number	Diff line
	@@ -452,7 +452,12 @@ xfs_cui_recover(
	mp->m_refc_maxlevels * 2, 0, XFS_TRANS_RESERVE, &tp);		mp->m_refc_maxlevels * 2, 0, XFS_TRANS_RESERVE, &tp);
	if (error)		if (error)
	return error;		return error;
	tp->t_dfops = dfops;		/*
			* Recovery stashes all deferred ops during intent processing and
			* finishes them on completion. Transfer current dfops state to this
			* transaction and transfer the result back before we return.
			*/
			xfs_defer_move(tp->t_dfops, dfops);
	cudp = xfs_trans_get_cud(tp, cuip);		cudp = xfs_trans_get_cud(tp, cuip);

	for (i = 0; i < cuip->cui_format.cui_nextents; i++) {		for (i = 0; i < cuip->cui_format.cui_nextents; i++) {
	@@ -474,8 +479,8 @@ xfs_cui_recover(
	new_len = refc->pe_len;		new_len = refc->pe_len;
	} else		} else
	error = xfs_trans_log_finish_refcount_update(tp, cudp,		error = xfs_trans_log_finish_refcount_update(tp, cudp,
	dfops, type, refc->pe_startblock, refc->pe_len,		tp->t_dfops, type, refc->pe_startblock,
	&new_fsb, &new_len, &rcur);		refc->pe_len, &new_fsb, &new_len, &rcur);
	if (error)		if (error)
	goto abort_error;		goto abort_error;

	@@ -486,21 +491,23 @@ xfs_cui_recover(
	switch (type) {		switch (type) {
	case XFS_REFCOUNT_INCREASE:		case XFS_REFCOUNT_INCREASE:
	error = xfs_refcount_increase_extent(		error = xfs_refcount_increase_extent(
	tp->t_mountp, dfops, &irec);		tp->t_mountp, tp->t_dfops,
			&irec);
	break;		break;
	case XFS_REFCOUNT_DECREASE:		case XFS_REFCOUNT_DECREASE:
	error = xfs_refcount_decrease_extent(		error = xfs_refcount_decrease_extent(
	tp->t_mountp, dfops, &irec);		tp->t_mountp, tp->t_dfops,
			&irec);
	break;		break;
	case XFS_REFCOUNT_ALLOC_COW:		case XFS_REFCOUNT_ALLOC_COW:
	error = xfs_refcount_alloc_cow_extent(		error = xfs_refcount_alloc_cow_extent(
	tp->t_mountp, dfops,		tp->t_mountp, tp->t_dfops,
	irec.br_startblock,		irec.br_startblock,
	irec.br_blockcount);		irec.br_blockcount);
	break;		break;
	case XFS_REFCOUNT_FREE_COW:		case XFS_REFCOUNT_FREE_COW:
	error = xfs_refcount_free_cow_extent(		error = xfs_refcount_free_cow_extent(
	tp->t_mountp, dfops,		tp->t_mountp, tp->t_dfops,
	irec.br_startblock,		irec.br_startblock,
	irec.br_blockcount);		irec.br_blockcount);
	break;		break;
	@@ -515,18 +522,13 @@ xfs_cui_recover(

	xfs_refcount_finish_one_cleanup(tp, rcur, error);		xfs_refcount_finish_one_cleanup(tp, rcur, error);
	set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);		set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);
	/*		xfs_defer_move(dfops, tp->t_dfops);
	* Recovery finishes all deferred ops once intent processing is
	* complete. Reset the trans reference because commit expects a finished
	* dfops or none at all.
	*/
	tp->t_dfops = NULL;
	error = xfs_trans_commit(tp);		error = xfs_trans_commit(tp);
	return error;		return error;

	abort_error:		abort_error:
	xfs_refcount_finish_one_cleanup(tp, rcur, error);		xfs_refcount_finish_one_cleanup(tp, rcur, error);
	tp->t_dfops = NULL;		xfs_defer_move(dfops, tp->t_dfops);
	xfs_trans_cancel(tp);		xfs_trans_cancel(tp);
	return error;		return error;
	}		}