1 files changed, 18 insertions, 153 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 39797490a1f1..b6b669df40f3 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -17,42 +17,34 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
+#include "xfs_log_format.h"
+#include "xfs_trans_resv.h"
 #include "xfs_bit.h"
-#include "xfs_log.h"
 #include "xfs_inum.h"
-#include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
 #include "xfs_mount.h"
-#include "xfs_error.h"
-#include "xfs_bmap_btree.h"
-#include "xfs_alloc_btree.h"
-#include "xfs_ialloc_btree.h"
-#include "xfs_btree.h"
-#include "xfs_dinode.h"
+#include "xfs_da_format.h"
 #include "xfs_inode.h"
-#include "xfs_inode_item.h"
-#include "xfs_alloc.h"
-#include "xfs_ialloc.h"
+#include "xfs_trans.h"
+#include "xfs_log.h"
 #include "xfs_log_priv.h"
-#include "xfs_buf_item.h"
 #include "xfs_log_recover.h"
+#include "xfs_inode_item.h"
 #include "xfs_extfree_item.h"
 #include "xfs_trans_priv.h"
+#include "xfs_alloc.h"
+#include "xfs_ialloc.h"
 #include "xfs_quota.h"
 #include "xfs_cksum.h"
 #include "xfs_trace.h"
 #include "xfs_icache.h"
-#include "xfs_icreate_item.h"
-
-/* Need all the magic numbers and buffer ops structures from these headers */
-#include "xfs_symlink.h"
-#include "xfs_da_btree.h"
-#include "xfs_dir2_format.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_dinode.h"
+#include "xfs_error.h"
 #include "xfs_dir2.h"
-#include "xfs_attr_leaf.h"
-#include "xfs_attr_remote.h"
 
 #define BLK_AVG(blk1, blk2)     ((blk1+blk2) >> 1)
 
@@ -305,9 +297,9 @@ xlog_header_check_dump(
         xfs_mount_t             *mp,
         xlog_rec_header_t       *head)
 {
-        xfs_debug(mp, "%s:  SB : uuid = %pU, fmt = %d\n",
+        xfs_debug(mp, "%s:  SB : uuid = %pU, fmt = %d",
                 __func__, &mp->m_sb.sb_uuid, XLOG_FMT);
-        xfs_debug(mp, "    log : uuid = %pU, fmt = %d\n",
+        xfs_debug(mp, "    log : uuid = %pU, fmt = %d",
                 &head->h_fs_uuid, be32_to_cpu(head->h_fmt));
 }
 #else
@@ -2362,7 +2354,7 @@ xlog_recover_do_reg_buffer(
                                         item->ri_buf[i].i_len, __func__);
                                 goto next;
                         }
-                        error = xfs_qm_dqcheck(mp, item->ri_buf[i].i_addr,
+                        error = xfs_dqcheck(mp, item->ri_buf[i].i_addr,
                                                -1, 0, XFS_QMOPT_DOWARN,
                                                "dquot_buf_recover");
                         if (error)
@@ -2394,133 +2386,6 @@ xlog_recover_do_reg_buffer(
 }
 
 /*
- * Do some primitive error checking on ondisk dquot data structures.
- */
-int
-xfs_qm_dqcheck(
-        struct xfs_mount *mp,
-        xfs_disk_dquot_t *ddq,
-        xfs_dqid_t       id,
-        uint             type,    /* used only when IO_dorepair is true */
-        uint             flags,
-        char             *str)
-{
-        xfs_dqblk_t      *d = (xfs_dqblk_t *)ddq;
-        int             errs = 0;
-
-        /*
-         * We can encounter an uninitialized dquot buffer for 2 reasons:
-         * 1. If we crash while deleting the quotainode(s), and those blks got
-         *    used for user data. This is because we take the path of regular
-         *    file deletion; however, the size field of quotainodes is never
-         *    updated, so all the tricks that we play in itruncate_finish
-         *    don't quite matter.
-         *
-         * 2. We don't play the quota buffers when there's a quotaoff logitem.
-         *    But the allocation will be replayed so we'll end up with an
-         *    uninitialized quota block.
-         *
-         * This is all fine; things are still consistent, and we haven't lost
-         * any quota information. Just don't complain about bad dquot blks.
-         */
-        if (ddq->d_magic != cpu_to_be16(XFS_DQUOT_MAGIC)) {
-                if (flags & XFS_QMOPT_DOWARN)
-                        xfs_alert(mp,
-                        "%s : XFS dquot ID 0x%x, magic 0x%x != 0x%x",
-                        str, id, be16_to_cpu(ddq->d_magic), XFS_DQUOT_MAGIC);
-                errs++;
-        }
-        if (ddq->d_version != XFS_DQUOT_VERSION) {
-                if (flags & XFS_QMOPT_DOWARN)
-                        xfs_alert(mp,
-                        "%s : XFS dquot ID 0x%x, version 0x%x != 0x%x",
-                        str, id, ddq->d_version, XFS_DQUOT_VERSION);
-                errs++;
-        }
-
-        if (ddq->d_flags != XFS_DQ_USER &&
-            ddq->d_flags != XFS_DQ_PROJ &&
-            ddq->d_flags != XFS_DQ_GROUP) {
-                if (flags & XFS_QMOPT_DOWARN)
-                        xfs_alert(mp,
-                        "%s : XFS dquot ID 0x%x, unknown flags 0x%x",
-                        str, id, ddq->d_flags);
-                errs++;
-        }
-
-        if (id != -1 && id != be32_to_cpu(ddq->d_id)) {
-                if (flags & XFS_QMOPT_DOWARN)
-                        xfs_alert(mp,
-                        "%s : ondisk-dquot 0x%p, ID mismatch: "
-                        "0x%x expected, found id 0x%x",
-                        str, ddq, id, be32_to_cpu(ddq->d_id));
-                errs++;
-        }
-
-        if (!errs && ddq->d_id) {
-                if (ddq->d_blk_softlimit &&
-                    be64_to_cpu(ddq->d_bcount) >
-                                be64_to_cpu(ddq->d_blk_softlimit)) {
-                        if (!ddq->d_btimer) {
-                                if (flags & XFS_QMOPT_DOWARN)
-                                        xfs_alert(mp,
-                        "%s : Dquot ID 0x%x (0x%p) BLK TIMER NOT STARTED",
-                                        str, (int)be32_to_cpu(ddq->d_id), ddq);
-                                errs++;
-                        }
-                }
-                if (ddq->d_ino_softlimit &&
-                    be64_to_cpu(ddq->d_icount) >
-                                be64_to_cpu(ddq->d_ino_softlimit)) {
-                        if (!ddq->d_itimer) {
-                                if (flags & XFS_QMOPT_DOWARN)
-                                        xfs_alert(mp,
-                        "%s : Dquot ID 0x%x (0x%p) INODE TIMER NOT STARTED",
-                                        str, (int)be32_to_cpu(ddq->d_id), ddq);
-                                errs++;
-                        }
-                }
-                if (ddq->d_rtb_softlimit &&
-                    be64_to_cpu(ddq->d_rtbcount) >
-                                be64_to_cpu(ddq->d_rtb_softlimit)) {
-                        if (!ddq->d_rtbtimer) {
-                                if (flags & XFS_QMOPT_DOWARN)
-                                        xfs_alert(mp,
-                        "%s : Dquot ID 0x%x (0x%p) RTBLK TIMER NOT STARTED",
-                                        str, (int)be32_to_cpu(ddq->d_id), ddq);
-                                errs++;
-                        }
-                }
-        }
-
-        if (!errs || !(flags & XFS_QMOPT_DQREPAIR))
-                return errs;
-
-        if (flags & XFS_QMOPT_DOWARN)
-                xfs_notice(mp, "Re-initializing dquot ID 0x%x", id);
-
-        /*
-         * Typically, a repair is only requested by quotacheck.
-         */
-        ASSERT(id != -1);
-        ASSERT(flags & XFS_QMOPT_DQREPAIR);
-        memset(d, 0, sizeof(xfs_dqblk_t));
-
-        d->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
-        d->dd_diskdq.d_version = XFS_DQUOT_VERSION;
-        d->dd_diskdq.d_flags = type;
-        d->dd_diskdq.d_id = cpu_to_be32(id);
-
-        if (xfs_sb_version_hascrc(&mp->m_sb)) {
-                uuid_copy(&d->dd_uuid, &mp->m_sb.sb_uuid);
-                xfs_update_cksum((char *)d, sizeof(struct xfs_dqblk),
-                                 XFS_DQUOT_CRC_OFF);
-        }
-
-        return errs;
-}
-
-/*
  * Perform a dquot buffer recovery.
  * Simple algorithm: if we have found a QUOTAOFF log item of the same type
  * (ie. USR or GRP), then just toss this buffer away; don't recover it.
@@ -3125,7 +2990,7 @@ xlog_recover_dquot_pass2(
          */
         dq_f = item->ri_buf[0].i_addr;
         ASSERT(dq_f);
-        error = xfs_qm_dqcheck(mp, recddq, dq_f->qlf_id, 0, XFS_QMOPT_DOWARN,
+        error = xfs_dqcheck(mp, recddq, dq_f->qlf_id, 0, XFS_QMOPT_DOWARN,
                            "xlog_recover_dquot_pass2 (log copy)");
         if (error)
                 return XFS_ERROR(EIO);
@@ -3145,7 +3010,7 @@ xlog_recover_dquot_pass2(
          * was among a chunk of dquots created earlier, and we did some
          * minimal initialization then.
          */
-        error = xfs_qm_dqcheck(mp, ddq, dq_f->qlf_id, 0, XFS_QMOPT_DOWARN,
+        error = xfs_dqcheck(mp, ddq, dq_f->qlf_id, 0, XFS_QMOPT_DOWARN,
                            "xlog_recover_dquot_pass2");
         if (error) {
                 xfs_buf_relse(bp);
@@ -4077,7 +3942,7 @@ xlog_unpack_data_crc(
         if (crc != rhead->h_crc) {
                 if (rhead->h_crc || xfs_sb_version_hascrc(&log->l_mp->m_sb)) {
                         xfs_alert(log->l_mp,
-                "log record CRC mismatch: found 0x%x, expected 0x%x.\n",
+                "log record CRC mismatch: found 0x%x, expected 0x%x.",
                                         le32_to_cpu(rhead->h_crc),
                                         le32_to_cpu(crc));
                         xfs_hex_dump(dp, 32);