1 files changed, 31 insertions, 27 deletions

diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index 603ab867259e..c82f06778a27 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
@@ -936,10 +936,11 @@ struct mutex  qcheck_lock;
 #define DQTEST_LIST_PRINT(l, NXT, title) \
 { \
           xfs_dqtest_t  *dqp; int i = 0;\
-          cmn_err(CE_DEBUG, "%s (#%d)", title, (int) (l)->qh_nelems); \
+          xfs_debug(NULL, "%s (#%d)", title, (int) (l)->qh_nelems); \
           for (dqp = (xfs_dqtest_t *)(l)->qh_next; dqp != NULL; \
                dqp = (xfs_dqtest_t *)dqp->NXT) { \
-                cmn_err(CE_DEBUG, "  %d. \"%d (%s)\"  bcnt = %d, icnt = %d", \
+                xfs_debug(dqp->q_mount,         \
+                        "  %d. \"%d (%s)\"  bcnt = %d, icnt = %d", \
                          ++i, dqp->d_id, DQFLAGTO_TYPESTR(dqp),      \
                          dqp->d_bcount, dqp->d_icount); } \
 }
@@ -963,16 +964,17 @@ xfs_qm_hashinsert(xfs_dqhash_t *h, xfs_dqtest_t *dqp)
 }
 STATIC void
 xfs_qm_dqtest_print(
-        xfs_dqtest_t    *d)
+        struct xfs_mount        *mp,
+        struct dqtest           *d)
 {
-        cmn_err(CE_DEBUG, "-----------DQTEST DQUOT----------------");
-        cmn_err(CE_DEBUG, "---- dquot ID = %d", d->d_id);
-        cmn_err(CE_DEBUG, "---- fs       = 0x%p", d->q_mount);
-        cmn_err(CE_DEBUG, "---- bcount   = %Lu (0x%x)",
+        xfs_debug(mp, "-----------DQTEST DQUOT----------------");
+        xfs_debug(mp, "---- dquot ID = %d", d->d_id);
+        xfs_debug(mp, "---- fs       = 0x%p", d->q_mount);
+        xfs_debug(mp, "---- bcount   = %Lu (0x%x)",
                 d->d_bcount, (int)d->d_bcount);
-        cmn_err(CE_DEBUG, "---- icount   = %Lu (0x%x)",
+        xfs_debug(mp, "---- icount   = %Lu (0x%x)",
                 d->d_icount, (int)d->d_icount);
-        cmn_err(CE_DEBUG, "---------------------------");
+        xfs_debug(mp, "---------------------------");
 }
 
 STATIC void
@@ -986,12 +988,14 @@ xfs_qm_dqtest_failed(
 {
         qmtest_nfails++;
         if (error)
-                cmn_err(CE_DEBUG, "quotacheck failed id=%d, err=%d\nreason: %s",
-                       d->d_id, error, reason);
+                xfs_debug(dqp->q_mount,
+                        "quotacheck failed id=%d, err=%d\nreason: %s",
+                        d->d_id, error, reason);
         else
-                cmn_err(CE_DEBUG, "quotacheck failed id=%d (%s) [%d != %d]",
-                       d->d_id, reason, (int)a, (int)b);
-        xfs_qm_dqtest_print(d);
+                xfs_debug(dqp->q_mount,
+                        "quotacheck failed id=%d (%s) [%d != %d]",
+                        d->d_id, reason, (int)a, (int)b);
+        xfs_qm_dqtest_print(dqp->q_mount, d);
         if (dqp)
                 xfs_qm_dqprint(dqp);
 }
@@ -1018,9 +1022,9 @@ xfs_dqtest_cmp2(
             be64_to_cpu(dqp->q_core.d_bcount) >=
             be64_to_cpu(dqp->q_core.d_blk_softlimit)) {
                 if (!dqp->q_core.d_btimer && dqp->q_core.d_id) {
-                        cmn_err(CE_DEBUG,
-                                "%d [%s] [0x%p] BLK TIMER NOT STARTED",
-                                d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);
+                        xfs_debug(dqp->q_mount,
+                                "%d [%s] BLK TIMER NOT STARTED",
+                                d->d_id, DQFLAGTO_TYPESTR(d));
                         err++;
                 }
         }
@@ -1028,16 +1032,16 @@ xfs_dqtest_cmp2(
             be64_to_cpu(dqp->q_core.d_icount) >=
             be64_to_cpu(dqp->q_core.d_ino_softlimit)) {
                 if (!dqp->q_core.d_itimer && dqp->q_core.d_id) {
-                        cmn_err(CE_DEBUG,
-                                "%d [%s] [0x%p] INO TIMER NOT STARTED",
-                                d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);
+                        xfs_debug(dqp->q_mount,
+                                "%d [%s] INO TIMER NOT STARTED",
+                                d->d_id, DQFLAGTO_TYPESTR(d));
                         err++;
                 }
         }
 #ifdef QUOTADEBUG
         if (!err) {
-                cmn_err(CE_DEBUG, "%d [%s] [0x%p] qchecked",
-                        d->d_id, DQFLAGTO_TYPESTR(d), d->q_mount);
+                xfs_debug(dqp->q_mount, "%d [%s] qchecked",
+                        d->d_id, DQFLAGTO_TYPESTR(d));
         }
 #endif
         return (err);
@@ -1220,12 +1224,12 @@ xfs_qm_internalqcheck(
                                  xfs_qm_internalqcheck_adjust,
                                  0, NULL, &done);
                 if (error) {
-                        cmn_err(CE_DEBUG, "Bulkstat returned error 0x%x", error);
+                        xfs_debug(mp, "Bulkstat returned error 0x%x", error);
                         break;
                 }
         } while (!done);
 
-        cmn_err(CE_DEBUG, "Checking results against system dquots");
+        xfs_debug(mp, "Checking results against system dquots");
         for (i = 0; i < qmtest_hashmask; i++) {
                 xfs_dqtest_t    *d, *n;
                 xfs_dqhash_t    *h;
@@ -1243,10 +1247,10 @@ xfs_qm_internalqcheck(
         }
 
         if (qmtest_nfails) {
-                cmn_err(CE_DEBUG, "******** quotacheck failed  ********");
-                cmn_err(CE_DEBUG, "failures = %d", qmtest_nfails);
+                xfs_debug(mp, "******** quotacheck failed  ********");
+                xfs_debug(mp, "failures = %d", qmtest_nfails);
         } else {
-                cmn_err(CE_DEBUG, "******** quotacheck successful! ********");
+                xfs_debug(mp, "******** quotacheck successful! ********");
         }
         kmem_free(qmtest_udqtab);
         kmem_free(qmtest_gdqtab);