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: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_dquot_item_recover.c b/fs/xfs/xfs_dquot_item_recover.c
index 07ff943972a37cd7a17716100918aed859a8eb26..3400be4c88f08da41c2ec3b6204a441b43929d73 100644 (file)
--- a/fs/xfs/xfs_dquot_item_recover.c
+++ b/fs/xfs/xfs_dquot_item_recover.c
@@ -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 */
 };

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 1ed0bdabb9a47157fdbf76d92c0e03c2dd062268..02148e341760e667b74676acd5136167b02ef768 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -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;
        }