Commit 2565a11b authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove log recovery quotaoff item dispatch for pass2 commit functions 



Quotaoff doesn't actually do anything, so take advantage of the
commit_pass2 pointer being optional and get rid of the switch
statement clause.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3c6ba3cf

fs/xfs/xfs_dquot_item_recover.c

+1 −0
Original line number Diff line number Diff line
@@ -197,4 +197,5 @@ xlog_recover_quotaoff_commit_pass1( 
const struct xlog_recover_item_ops xlog_quotaoff_item_ops = {

	.item_type		= XFS_LI_QUOTAOFF,

	.commit_pass1		= xlog_recover_quotaoff_commit_pass1,

	/* nothing to commit in pass2 */

};

fs/xfs/xfs_log_recover.c

+6 −27
Original line number Diff line number Diff line
@@ -2034,31 +2034,6 @@ xlog_buf_readahead( 
		xfs_buf_readahead(log->l_mp->m_ddev_targp, blkno, len, ops);

}



STATIC int

xlog_recover_commit_pass2(

	struct xlog			*log,

	struct xlog_recover		*trans,

	struct list_head		*buffer_list,

	struct xlog_recover_item	*item)

{

	trace_xfs_log_recover_item_recover(log, trans, item, XLOG_RECOVER_PASS2);



	if (item->ri_ops->commit_pass2)

		return item->ri_ops->commit_pass2(log, buffer_list, item,

				trans->r_lsn);



	switch (ITEM_TYPE(item)) {

	case XFS_LI_QUOTAOFF:

		/* nothing to do in pass2 */

		return 0;

	default:

		xfs_warn(log->l_mp, "%s: invalid item type (%d)",

			__func__, ITEM_TYPE(item));

		ASSERT(0);

		return -EFSCORRUPTED;

	}

}



STATIC int

xlog_recover_items_pass2(

	struct xlog                     *log,
@@ -2070,8 +2045,12 @@ xlog_recover_items_pass2( 
	int				error = 0;



	list_for_each_entry(item, item_list, ri_list) {

		error = xlog_recover_commit_pass2(log, trans,

					  buffer_list, item);

		trace_xfs_log_recover_item_recover(log, trans, item,

				XLOG_RECOVER_PASS2);



		if (item->ri_ops->commit_pass2)

			error = item->ri_ops->commit_pass2(log, buffer_list,

					item, trans->r_lsn);

		if (error)

			return error;

	}