staging/lustre: Remove stray space before newline in messages

There were some messages in Lustre that ended with a space followed by
a newline which is pointless, so remove the extra spaces.
Found with checkpatch.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 20fecaf477d34438c2cc313f5bd6f6f95c7d95b7..3f53292c957923092552e953064295d11a97e640 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -307,7 +307,7 @@ static unsigned int loop_get_bio(struct lloop_device *lo, struct bio **req)
        rw = first->bi_rw;
        bio = &lo->lo_bio;
        while (*bio && (*bio)->bi_rw == rw) {
-               CDEBUG(D_INFO, "bio sector %llu size %u count %u vcnt%u \n",
+               CDEBUG(D_INFO, "bio sector %llu size %u count %u vcnt%u\n",
                       (unsigned long long)(*bio)->bi_iter.bi_sector,
                       (*bio)->bi_iter.bi_size,
                       page_count, (*bio)->bi_vcnt);

diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index 0e5bd4f1ec52cb24e84fb06367c53c200177e2e3..671039abaa6f39b2bd5908c689a178b1e55464f0 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -367,7 +367,7 @@ void ll_ra_stats_inc(struct address_space *mapping, enum ra_stat which)
 #define RAS_CDEBUG(ras) \
        CDEBUG(D_READA,                                               \
               "lrp %lu cr %lu cp %lu ws %lu wl %lu nra %lu r %lu ri %lu"    \
-              "csr %lu sf %lu sp %lu sl %lu \n",                           \
+              "csr %lu sf %lu sp %lu sl %lu\n",                            \
               ras->ras_last_readpage, ras->ras_consecutive_requests,   \
               ras->ras_consecutive_pages, ras->ras_window_start,           \
               ras->ras_window_len, ras->ras_next_readahead,             \
@@ -575,7 +575,7 @@ stride_pg_count(pgoff_t st_off, unsigned long st_len, unsigned long st_pgs,
        if (end_left > st_pgs)
                end_left = st_pgs;
 
-       CDEBUG(D_READA, "start %llu, end %llu start_left %lu end_left %lu \n",
+       CDEBUG(D_READA, "start %llu, end %llu start_left %lu end_left %lu\n",
               start, end, start_left, end_left);
 
        if (start == end)
@@ -655,7 +655,7 @@ static int ll_read_ahead_pages(const struct lu_env *env,
                        offset = offset % (ria->ria_length);
                        if (offset > ria->ria_pages) {
                                page_idx += ria->ria_length - offset;
-                               CDEBUG(D_READA, "i %lu skip %lu \n", page_idx,
+                               CDEBUG(D_READA, "i %lu skip %lu\n", page_idx,
                                       ria->ria_length - offset);
                                continue;
                        }
@@ -785,7 +785,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,
         * if the region we failed to issue read-ahead on is still ahead
         * of the app and behind the next index to start read-ahead from
         */
-       CDEBUG(D_READA, "ra_end %lu end %lu stride end %lu \n",
+       CDEBUG(D_READA, "ra_end %lu end %lu stride end %lu\n",
               ra_end, end, ria->ria_end);
 
        if (ra_end != end + 1) {

diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index 8871bce64820ead88274b949be0f1acd76b814fe..9235d7d047ec1da3a0601f026bb15509eabed714 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -185,7 +185,7 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
                        return -ENOMEM;
        }
 
-       CDEBUG(D_INFO, "lov_packmd: LOV_MAGIC 0x%08X, lmm_size = %d \n",
+       CDEBUG(D_INFO, "lov_packmd: LOV_MAGIC 0x%08X, lmm_size = %d\n",
               lmm_magic, lmm_size);
 
        lmmv1 = *lmmp;

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_lock.c b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
index 6f44dde997c166b1a1148c535ab2832e7b3d7c38..7b7f344c11d11358beaa51d19416bd272448bbe8 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/cl_lock.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
@@ -1453,7 +1453,7 @@ int cl_wait(const struct lu_env *env, struct cl_lock *lock)
 
        LINVRNT(cl_lock_invariant(env, lock));
        LASSERTF(lock->cll_state == CLS_ENQUEUED || lock->cll_state == CLS_HELD,
-                "Wrong state %d \n", lock->cll_state);
+                "Wrong state %d\n", lock->cll_state);
        LASSERT(lock->cll_holds > 0);
 
        do {

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 53668e28b5ae5d2dce8465fd9affad6d7f3c0a40..10f262f99b02c606fa94a2ded842fd3d2866fd77 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -843,7 +843,7 @@ void osc_update_next_shrink(struct client_obd *cli)
 {
        cli->cl_next_shrink_grant =
                cfs_time_shift(cli->cl_grant_shrink_interval);
-       CDEBUG(D_CACHE, "next time %ld to shrink grant \n",
+       CDEBUG(D_CACHE, "next time %ld to shrink grant\n",
               cli->cl_next_shrink_grant);
 }
 
@@ -1014,7 +1014,7 @@ static int osc_add_shrink_grant(struct client_obd *client)
                        client->cl_import->imp_obd->obd_name, rc);
                return rc;
        }
-       CDEBUG(D_CACHE, "add grant client %s \n",
+       CDEBUG(D_CACHE, "add grant client %s\n",
               client->cl_import->imp_obd->obd_name);
        osc_update_next_shrink(client);
        return 0;