LU-5551 lustre: fix messages with missisng newlines

Add missisng newlines to four CERROR() messages. Restore the trailing
newline in the definition of OSC_DUMP_GRANT(). Remove an unnecessary
CDEBUG() from ldlm_pool_recalc().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I549de59dd9cd205e1a6d0fbcd70ccd1cbf5e389b
Reviewed-on: http://review.whamcloud.com/11996
Tested-by: Jenkins
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c
index aeb3fa4..a526f08 100644 (file)
--- a/lustre/ldlm/ldlm_pool.c
+++ b/lustre/ldlm/ldlm_pool.c
@@ -611,10 +611,6 @@ int ldlm_pool_recalc(struct ldlm_pool *pl)
                              pl->pl_recalc_period;
        if (recalc_interval_sec <= 0) {
                /* Prevent too frequent recalculation. */
                              pl->pl_recalc_period;
        if (recalc_interval_sec <= 0) {
                /* Prevent too frequent recalculation. */

-               CDEBUG(D_DLMTRACE, "Negative interval(%ld), "
-                      "too short period(%ld)",
-                      recalc_interval_sec,
-                      pl->pl_recalc_period);

                recalc_interval_sec = 1;
        }
 
                recalc_interval_sec = 1;
        }
 

diff --git a/lustre/lod/lproc_lod.c b/lustre/lod/lproc_lod.c
index fe89355..08c5673 100644 (file)
--- a/lustre/lod/lproc_lod.c
+++ b/lustre/lod/lproc_lod.c
@@ -817,8 +817,8 @@ int lod_procfs_init(struct lod_device *lod)
        lod->lod_symlink = lprocfs_add_symlink(obd->obd_name, lov_proc_dir,
                                               "../lod/%s", obd->obd_name);
        if (lod->lod_symlink == NULL)
        lod->lod_symlink = lprocfs_add_symlink(obd->obd_name, lov_proc_dir,
                                               "../lod/%s", obd->obd_name);
        if (lod->lod_symlink == NULL)

-               CERROR("could not register LOV symlink for "
-                       "/proc/fs/lustre/lod/%s.", obd->obd_name);
+               CERROR("cannot create LOV symlink for /proc/fs/lustre/lod/%s\n",
+                      obd->obd_name);

        RETURN(0);
 
 out:
        RETURN(0);
 
 out:

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index c55c4c2..adfdba7 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -1340,7 +1340,7 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
        struct client_obd *__tmp = (cli);                               \
        CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %ld/%lu "  \
               "dropped: %ld avail: %ld, reserved: %ld, flight: %d }"   \
        struct client_obd *__tmp = (cli);                               \
        CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %ld/%lu "  \
               "dropped: %ld avail: %ld, reserved: %ld, flight: %d }"   \

-              "lru {in list: %ld, left: %ld, waiters: %d }" fmt,       \
+              "lru {in list: %ld, left: %ld, waiters: %d }"fmt"\n",    \

               __tmp->cl_import->imp_obd->obd_name,                     \
               __tmp->cl_dirty_pages, __tmp->cl_dirty_max_pages,        \
               atomic_long_read(&obd_dirty_pages), obd_max_dirty_pages, \
               __tmp->cl_import->imp_obd->obd_name,                     \
               __tmp->cl_dirty_pages, __tmp->cl_dirty_max_pages,        \
               atomic_long_read(&obd_dirty_pages), obd_max_dirty_pages, \

diff --git a/lustre/osp/lproc_osp.c b/lustre/osp/lproc_osp.c
index 2dbcb73..1dd26b7 100644 (file)
--- a/lustre/osp/lproc_osp.c
+++ b/lustre/osp/lproc_osp.c
@@ -844,8 +844,8 @@ void osp_lprocfs_init(struct osp_device *osp)
        osp->opd_symlink = lprocfs_add_symlink(obd->obd_name, osc_proc_dir,
                                               "../osp/%s", obd->obd_name);
        if (osp->opd_symlink == NULL)
        osp->opd_symlink = lprocfs_add_symlink(obd->obd_name, osc_proc_dir,
                                               "../osp/%s", obd->obd_name);
        if (osp->opd_symlink == NULL)

-               CERROR("could not register OSC symlink for "
-                      "/proc/fs/lustre/osp/%s.", obd->obd_name);
+               CERROR("cannot create OSC symlink for /proc/fs/lustre/osp/%s\n",
+                      obd->obd_name);

 }
 
 #endif /* LPROCFS */
 }
 
 #endif /* LPROCFS */

diff --git a/lustre/osp/osp_object.c b/lustre/osp/osp_object.c
index 8d9f51a..07aeeec 100644 (file)
--- a/lustre/osp/osp_object.c
+++ b/lustre/osp/osp_object.c
@@ -1148,7 +1148,7 @@ static int __osp_xattr_set(const struct lu_env *env, struct dt_object *dt,
 
        oxe = osp_oac_xattr_find_or_add(o, name, buf->lb_len);
        if (oxe == NULL) {
 
        oxe = osp_oac_xattr_find_or_add(o, name, buf->lb_len);
        if (oxe == NULL) {

-               CWARN("%s: Fail to add xattr (%s) to cache for "DFID,
+               CWARN("%s: cannot cache xattr '%s' of "DFID"\n",

                      dt->do_lu.lo_dev->ld_obd->obd_name,
                      name, PFID(lu_object_fid(&dt->do_lu)));
 
                      dt->do_lu.lo_dev->ld_obd->obd_name,
                      name, PFID(lu_object_fid(&dt->do_lu)));
 


@@ -1163,7 +1163,7 @@ static int __osp_xattr_set(const struct lu_env *env, struct dt_object *dt,
                osp_oac_xattr_put(oxe);
                oxe = tmp;
                if (tmp == NULL) {
                osp_oac_xattr_put(oxe);
                oxe = tmp;
                if (tmp == NULL) {

-                       CWARN("%s: Fail to update xattr (%s) to cache for "DFID,
+                       CWARN("%s: cannot update cached xattr '%s' of "DFID"\n",

                              dt->do_lu.lo_dev->ld_obd->obd_name,
                              name, PFID(lu_object_fid(&dt->do_lu)));
                        spin_lock(&o->opo_lock);
                              dt->do_lu.lo_dev->ld_obd->obd_name,
                              name, PFID(lu_object_fid(&dt->do_lu)));
                        spin_lock(&o->opo_lock);