LU-5538 mdc: Report D_CHANGELOG messages as D_HSM.

Removed the D_CHANGELOG pseudo-debug flag that wasn't actually defined
as a usable one. Report the D_CHANGELOG messages as D_HSM ones instead
since this is the primary user of these messages.

Signed-off-by: Henri Doreau <henri.doreau@cea.fr>
Change-Id: I4d82b16935d053e1b7e43512a1b9368f4b0316b5
Reviewed-on: http://review.whamcloud.com/11558
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 7fed354..de6ebf5 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -1995,8 +1995,6 @@ static struct kuc_hdr *changelog_kuc_hdr(char *buf, int len, int flags)
        return lh;
 }
 
-#define D_CHANGELOG 0
-
 struct changelog_show {
        __u64           cs_startrec;
        __u32           cs_flags;
@@ -2024,17 +2022,17 @@ static int changelog_kkuc_cb(const struct lu_env *env, struct llog_handle *llh,
 
        if (rec->cr.cr_index < cs->cs_startrec) {
                /* Skip entries earlier than what we are interested in */
-               CDEBUG(D_CHANGELOG, "rec="LPU64" start="LPU64"\n",
+               CDEBUG(D_HSM, "rec="LPU64" start="LPU64"\n",
                       rec->cr.cr_index, cs->cs_startrec);
                RETURN(0);
        }
 
-       CDEBUG(D_CHANGELOG, LPU64" %02d%-5s "LPU64" 0x%x t="DFID" p="DFID
-               " %.*s\n", rec->cr.cr_index, rec->cr.cr_type,
-               changelog_type2str(rec->cr.cr_type), rec->cr.cr_time,
-               rec->cr.cr_flags & CLF_FLAGMASK,
-               PFID(&rec->cr.cr_tfid), PFID(&rec->cr.cr_pfid),
-               rec->cr.cr_namelen, changelog_rec_name(&rec->cr));
+       CDEBUG(D_HSM, LPU64" %02d%-5s "LPU64" 0x%x t="DFID" p="DFID" %.*s\n",
+              rec->cr.cr_index, rec->cr.cr_type,
+              changelog_type2str(rec->cr.cr_type), rec->cr.cr_time,
+              rec->cr.cr_flags & CLF_FLAGMASK,
+              PFID(&rec->cr.cr_tfid), PFID(&rec->cr.cr_pfid),
+              rec->cr.cr_namelen, changelog_rec_name(&rec->cr));
 
        len = sizeof(*lh) + changelog_rec_size(&rec->cr) + rec->cr.cr_namelen;
 
@@ -2043,7 +2041,7 @@ static int changelog_kkuc_cb(const struct lu_env *env, struct llog_handle *llh,
         memcpy(lh + 1, &rec->cr, len - sizeof(*lh));
 
         rc = libcfs_kkuc_msg_put(cs->cs_fp, lh);
-        CDEBUG(D_CHANGELOG, "kucmsg fp %p len %d rc %d\n", cs->cs_fp, len,rc);
+       CDEBUG(D_HSM, "kucmsg fp %p len %d rc %d\n", cs->cs_fp, len, rc);
 
         RETURN(rc);
 }
@@ -2056,7 +2054,7 @@ static int mdc_changelog_send_thread(void *csdata)
        struct kuc_hdr *kuch;
        int rc;
 
-       CDEBUG(D_CHANGELOG, "changelog to fp=%p start "LPU64"\n",
+       CDEBUG(D_HSM, "changelog to fp=%p start "LPU64"\n",
               cs->cs_fp, cs->cs_startrec);
 
        OBD_ALLOC(cs->cs_buf, KUC_CHANGELOG_MSG_MAXSIZE);
@@ -2132,8 +2130,7 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
                OBD_FREE_PTR(cs);
        } else {
                rc = 0;
-               CDEBUG(D_CHANGELOG, "%s: started changelog thread\n",
-                      obd->obd_name);
+               CDEBUG(D_HSM, "%s: started changelog thread\n", obd->obd_name);
        }
 
        return rc;