SUNRPC: fix print format for tk_pid in auth_gss support

The tk_pid field is an unsigned short.  The proper print format specifier for
that type is %5u, not %4d.

Also clean up some miscellaneous print formatting nits.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

13 files changed, 73 insertions, 63 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index e1a104abb782..2fe8e91f5bc1 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -241,7 +241,7 @@ gss_fill_context(const void *p, const void *end, struct gss_cl_ctx *ctx, struct
         }
         return q;
 err:
-        dprintk("RPC:      gss_fill_context returning %ld\n", -PTR_ERR(p));
+        dprintk("RPC:       gss_fill_context returning %ld\n", -PTR_ERR(p));
         return p;
 }
 
@@ -276,10 +276,10 @@ __gss_find_upcall(struct gss_auth *gss_auth, uid_t uid)
                 if (pos->uid != uid)
                         continue;
                 atomic_inc(&pos->count);
-                dprintk("RPC:      gss_find_upcall found msg %p\n", pos);
+                dprintk("RPC:       gss_find_upcall found msg %p\n", pos);
                 return pos;
         }
-        dprintk("RPC:      gss_find_upcall found nothing\n");
+        dprintk("RPC:       gss_find_upcall found nothing\n");
         return NULL;
 }
 
@@ -393,7 +393,8 @@ gss_refresh_upcall(struct rpc_task *task)
         struct gss_upcall_msg *gss_msg;
         int err = 0;
 
-        dprintk("RPC: %4u gss_refresh_upcall for uid %u\n", task->tk_pid, cred->cr_uid);
+        dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid,
+                                                                cred->cr_uid);
         gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred);
         if (IS_ERR(gss_msg)) {
                 err = PTR_ERR(gss_msg);
@@ -413,8 +414,8 @@ gss_refresh_upcall(struct rpc_task *task)
         spin_unlock(&gss_auth->lock);
         gss_release_msg(gss_msg);
 out:
-        dprintk("RPC: %4u gss_refresh_upcall for uid %u result %d\n", task->tk_pid,
-                        cred->cr_uid, err);
+        dprintk("RPC: %5u gss_refresh_upcall for uid %u result %d\n",
+                        task->tk_pid, cred->cr_uid, err);
         return err;
 }
 
@@ -426,7 +427,7 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
         DEFINE_WAIT(wait);
         int err = 0;
 
-        dprintk("RPC: gss_upcall for uid %u\n", cred->cr_uid);
+        dprintk("RPC:       gss_upcall for uid %u\n", cred->cr_uid);
         gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred);
         if (IS_ERR(gss_msg)) {
                 err = PTR_ERR(gss_msg);
@@ -454,7 +455,8 @@ out_intr:
         finish_wait(&gss_msg->waitqueue, &wait);
         gss_release_msg(gss_msg);
 out:
-        dprintk("RPC: gss_create_upcall for uid %u result %d\n", cred->cr_uid, err);
+        dprintk("RPC:       gss_create_upcall for uid %u result %d\n",
+                        cred->cr_uid, err);
         return err;
 }
 
@@ -546,14 +548,14 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
         }
         gss_put_ctx(ctx);
         kfree(buf);
-        dprintk("RPC:      gss_pipe_downcall returning length %Zu\n", mlen);
+        dprintk("RPC:       gss_pipe_downcall returning length %Zu\n", mlen);
         return mlen;
 err_put_ctx:
         gss_put_ctx(ctx);
 err:
         kfree(buf);
 out:
-        dprintk("RPC:      gss_pipe_downcall returning %d\n", err);
+        dprintk("RPC:       gss_pipe_downcall returning %d\n", err);
         return err;
 }
 
@@ -591,7 +593,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
         static unsigned long ratelimit;
 
         if (msg->errno < 0) {
-                dprintk("RPC:      gss_pipe_destroy_msg releasing msg %p\n",
+                dprintk("RPC:       gss_pipe_destroy_msg releasing msg %p\n",
                                 gss_msg);
                 atomic_inc(&gss_msg->count);
                 gss_unhash_msg(gss_msg);
@@ -618,7 +620,7 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
         struct rpc_auth * auth;
         int err = -ENOMEM; /* XXX? */
 
-        dprintk("RPC:      creating GSS authenticator for client %p\n",clnt);
+        dprintk("RPC:       creating GSS authenticator for client %p\n", clnt);
 
         if (!try_module_get(THIS_MODULE))
                 return ERR_PTR(err);
@@ -670,8 +672,8 @@ gss_destroy(struct rpc_auth *auth)
 {
         struct gss_auth *gss_auth;
 
-        dprintk("RPC:      destroying GSS authenticator %p flavor %d\n",
-                auth, auth->au_flavor);
+        dprintk("RPC:       destroying GSS authenticator %p flavor %d\n",
+                        auth, auth->au_flavor);
 
         gss_auth = container_of(auth, struct gss_auth, rpc_auth);
         rpc_unlink(gss_auth->dentry);
@@ -689,7 +691,7 @@ gss_destroy(struct rpc_auth *auth)
 static void
 gss_destroy_ctx(struct gss_cl_ctx *ctx)
 {
-        dprintk("RPC:      gss_destroy_ctx\n");
+        dprintk("RPC:       gss_destroy_ctx\n");
 
         if (ctx->gc_gss_ctx)
                 gss_delete_sec_context(&ctx->gc_gss_ctx);
@@ -703,7 +705,7 @@ gss_destroy_cred(struct rpc_cred *rc)
 {
         struct gss_cred *cred = container_of(rc, struct gss_cred, gc_base);
 
-        dprintk("RPC:      gss_destroy_cred \n");
+        dprintk("RPC:       gss_destroy_cred \n");
 
         if (cred->gc_ctx)
                 gss_put_ctx(cred->gc_ctx);
@@ -726,7 +728,7 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         struct gss_cred *cred = NULL;
         int err = -ENOMEM;
 
-        dprintk("RPC:      gss_create_cred for uid %d, flavor %d\n",
+        dprintk("RPC:       gss_create_cred for uid %d, flavor %d\n",
                 acred->uid, auth->au_flavor);
 
         if (!(cred = kzalloc(sizeof(*cred), GFP_KERNEL)))
@@ -745,7 +747,7 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         return &cred->gc_base;
 
 out_err:
-        dprintk("RPC:      gss_create_cred failed with error %d\n", err);
+        dprintk("RPC:       gss_create_cred failed with error %d\n", err);
         return ERR_PTR(err);
 }
 
@@ -799,7 +801,7 @@ gss_marshal(struct rpc_task *task, __be32 *p)
         struct kvec     iov;
         struct xdr_buf  verf_buf;
 
-        dprintk("RPC: %4u gss_marshal\n", task->tk_pid);
+        dprintk("RPC: %5u gss_marshal\n", task->tk_pid);
 
         *p++ = htonl(RPC_AUTH_GSS);
         cred_len = p++;
@@ -865,7 +867,7 @@ gss_validate(struct rpc_task *task, __be32 *p)
         u32             flav,len;
         u32             maj_stat;
 
-        dprintk("RPC: %4u gss_validate\n", task->tk_pid);
+        dprintk("RPC: %5u gss_validate\n", task->tk_pid);
 
         flav = ntohl(*p++);
         if ((len = ntohl(*p++)) > RPC_MAX_AUTH_SIZE)
@@ -888,12 +890,12 @@ gss_validate(struct rpc_task *task, __be32 *p)
          * calculate the length of the verifier: */
         task->tk_auth->au_verfsize = XDR_QUADLEN(len) + 2;
         gss_put_ctx(ctx);
-        dprintk("RPC: %4u GSS gss_validate: gss_verify_mic succeeded.\n",
+        dprintk("RPC: %5u gss_validate: gss_verify_mic succeeded.\n",
                         task->tk_pid);
         return p + XDR_QUADLEN(len);
 out_bad:
         gss_put_ctx(ctx);
-        dprintk("RPC: %4u gss_validate failed.\n", task->tk_pid);
+        dprintk("RPC: %5u gss_validate failed.\n", task->tk_pid);
         return NULL;
 }
 
@@ -1063,7 +1065,7 @@ gss_wrap_req(struct rpc_task *task,
         struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
         int             status = -EIO;
 
-        dprintk("RPC: %4u gss_wrap_req\n", task->tk_pid);
+        dprintk("RPC: %5u gss_wrap_req\n", task->tk_pid);
         if (ctx->gc_proc != RPC_GSS_PROC_DATA) {
                 /* The spec seems a little ambiguous here, but I think that not
                  * wrapping context destruction requests makes the most sense.
@@ -1086,7 +1088,7 @@ gss_wrap_req(struct rpc_task *task,
         }
 out:
         gss_put_ctx(ctx);
-        dprintk("RPC: %4u gss_wrap_req returning %d\n", task->tk_pid, status);
+        dprintk("RPC: %5u gss_wrap_req returning %d\n", task->tk_pid, status);
         return status;
 }
 
@@ -1192,7 +1194,7 @@ out_decode:
         status = decode(rqstp, p, obj);
 out:
         gss_put_ctx(ctx);
-        dprintk("RPC: %4u gss_unwrap_resp returning %d\n", task->tk_pid,
+        dprintk("RPC: %5u gss_unwrap_resp returning %d\n", task->tk_pid,
                         status);
         return status;
 }
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index d926cda88623..cd64efd5921e 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -66,7 +66,7 @@ krb5_encrypt(
                 goto out;
 
         if (crypto_blkcipher_ivsize(tfm) > 16) {
-                dprintk("RPC:      gss_k5encrypt: tfm iv size to large %d\n",
+                dprintk("RPC:       gss_k5encrypt: tfm iv size to large %d\n",
                          crypto_blkcipher_ivsize(tfm));
                 goto out;
         }
@@ -79,7 +79,7 @@ krb5_encrypt(
 
         ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length);
 out:
-        dprintk("RPC:      krb5_encrypt returns %d\n",ret);
+        dprintk("RPC:       krb5_encrypt returns %d\n", ret);
         return ret;
 }
 
@@ -102,7 +102,7 @@ krb5_decrypt(
                 goto out;
 
         if (crypto_blkcipher_ivsize(tfm) > 16) {
-                dprintk("RPC:      gss_k5decrypt: tfm iv size to large %d\n",
+                dprintk("RPC:       gss_k5decrypt: tfm iv size to large %d\n",
                         crypto_blkcipher_ivsize(tfm));
                 goto out;
         }
@@ -114,7 +114,7 @@ krb5_decrypt(
 
         ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length);
 out:
-        dprintk("RPC:      gss_k5decrypt returns %d\n",ret);
+        dprintk("RPC:       gss_k5decrypt returns %d\n",ret);
         return ret;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index 05d4bee86fc0..7b1943217053 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -175,7 +175,8 @@ gss_import_sec_context_kerberos(const void *p,
         }
 
         ctx_id->internal_ctx_id = ctx;
-        dprintk("RPC:      Successfully imported new context.\n");
+
+        dprintk("RPC:       Successfully imported new context.\n");
         return 0;
 
 out_err_free_key2:
diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
index d0bb5064f8c5..a0d9faa59cb5 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@@ -83,7 +83,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
         s32                     now;
         u32                     seq_send;
 
-        dprintk("RPC:     gss_krb5_seal\n");
+        dprintk("RPC:       gss_krb5_seal\n");
 
         now = get_seconds();
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_seqnum.c b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
index c604baf3a5f6..2f0b11257016 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seqnum.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
@@ -70,7 +70,7 @@ krb5_get_seq_num(struct crypto_blkcipher *key,
         s32 code;
         unsigned char plain[8];
 
-        dprintk("RPC:      krb5_get_seq_num:\n");
+        dprintk("RPC:       krb5_get_seq_num:\n");
 
         if ((code = krb5_decrypt(key, cksum, buf, plain, 8)))
                 return code;
diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index 87f8977ccece..e30a993466bc 100644
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -86,7 +86,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
         unsigned char           *ptr = (unsigned char *)read_token->data;
         int                     bodysize;
 
-        dprintk("RPC:      krb5_read_token\n");
+        dprintk("RPC:       krb5_read_token\n");
 
         if (g_verify_token_header(&ctx->mech_used, &bodysize, &ptr,
                                         read_token->len))
diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index fe25b3d898dc..42b3220bed39 100644
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -129,7 +129,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
         struct page             **tmp_pages;
         u32                     seq_send;
 
-        dprintk("RPC:     gss_wrap_kerberos\n");
+        dprintk("RPC:       gss_wrap_kerberos\n");
 
         now = get_seconds();
 
@@ -215,7 +215,7 @@ gss_unwrap_kerberos(struct gss_ctx *ctx, int offset, struct xdr_buf *buf)
         int                     data_len;
         int                     blocksize;
 
-        dprintk("RPC:      gss_unwrap_kerberos\n");
+        dprintk("RPC:       gss_unwrap_kerberos\n");
 
         ptr = (u8 *)buf->head[0].iov_base + offset;
         if (g_verify_token_header(&kctx->mech_used, &bodysize, &ptr,
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index 3db745379d06..c7681db96fb7 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -113,7 +113,7 @@ gss_mech_register(struct gss_api_mech *gm)
         spin_lock(&registered_mechs_lock);
         list_add(&gm->gm_list, &registered_mechs);
         spin_unlock(&registered_mechs_lock);
-        dprintk("RPC:      registered gss mechanism %s\n", gm->gm_name);
+        dprintk("RPC:       registered gss mechanism %s\n", gm->gm_name);
         return 0;
 }
 
@@ -125,7 +125,7 @@ gss_mech_unregister(struct gss_api_mech *gm)
         spin_lock(&registered_mechs_lock);
         list_del(&gm->gm_list);
         spin_unlock(&registered_mechs_lock);
-        dprintk("RPC:      unregistered gss mechanism %s\n", gm->gm_name);
+        dprintk("RPC:       unregistered gss mechanism %s\n", gm->gm_name);
         gss_mech_free(gm);
 }
 
@@ -298,7 +298,7 @@ gss_unwrap(struct gss_ctx	*ctx_id,
 u32
 gss_delete_sec_context(struct gss_ctx   **context_handle)
 {
-        dprintk("RPC:      gss_delete_sec_context deleting %p\n",
+        dprintk("RPC:       gss_delete_sec_context deleting %p\n",
                         *context_handle);
 
         if (!*context_handle)
diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index 8ef3f1c19435..7e15aa68ae64 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -97,7 +97,8 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
         if (IS_ERR(p))
                 goto out_err_free_ctx;
         if (version != 1) {
-                dprintk("RPC: unknown spkm3 token format: obsolete nfs-utils?\n");
+                dprintk("RPC:       unknown spkm3 token format: "
+                                "obsolete nfs-utils?\n");
                 goto out_err_free_ctx;
         }
 
@@ -138,7 +139,7 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
 
         ctx_id->internal_ctx_id = ctx;
 
-        dprintk("Successfully imported new spkm context.\n");
+        dprintk("RPC:       Successfully imported new spkm context.\n");
         return 0;
 
 out_err_free_intg_key:
@@ -183,7 +184,7 @@ gss_verify_mic_spkm3(struct gss_ctx		*ctx,
 
         maj_stat = spkm3_read_token(sctx, checksum, signbuf, SPKM_MIC_TOK);
 
-        dprintk("RPC: gss_verify_mic_spkm3 returning %d\n", maj_stat);
+        dprintk("RPC:       gss_verify_mic_spkm3 returning %d\n", maj_stat);
         return maj_stat;
 }
 
@@ -197,7 +198,7 @@ gss_get_mic_spkm3(struct gss_ctx	*ctx,
 
         err = spkm3_make_token(sctx, message_buffer,
                                 message_token, SPKM_MIC_TOK);
-        dprintk("RPC: gss_get_mic_spkm3 returning %d\n", err);
+        dprintk("RPC:       gss_get_mic_spkm3 returning %d\n", err);
         return err;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c
index b179d58c6249..104cbf4f769f 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
@@ -75,20 +75,21 @@ spkm3_make_token(struct spkm3_ctx *ctx,
         now = jiffies;
 
         if (ctx->ctx_id.len != 16) {
-                dprintk("RPC: spkm3_make_token BAD ctx_id.len %d\n",
+                dprintk("RPC:       spkm3_make_token BAD ctx_id.len %d\n",
                                 ctx->ctx_id.len);
                 goto out_err;
         }
 
         if (!g_OID_equal(&ctx->intg_alg, &hmac_md5_oid)) {
-                dprintk("RPC: gss_spkm3_seal: unsupported I-ALG algorithm."
-                                "only support hmac-md5 I-ALG.\n");
+                dprintk("RPC:       gss_spkm3_seal: unsupported I-ALG "
+                                "algorithm.  only support hmac-md5 I-ALG.\n");
                 goto out_err;
         } else
                 checksum_type = CKSUMTYPE_HMAC_MD5;
 
         if (!g_OID_equal(&ctx->conf_alg, &cast5_cbc_oid)) {
-                dprintk("RPC: gss_spkm3_seal: unsupported C-ALG algorithm\n");
+                dprintk("RPC:       gss_spkm3_seal: unsupported C-ALG "
+                                "algorithm\n");
                 goto out_err;
         }
 
@@ -113,7 +114,8 @@ spkm3_make_token(struct spkm3_ctx *ctx,
 
                 spkm3_make_mic_token(&ptr, tokenlen, &mic_hdr, &md5cksum, md5elen, md5zbit);
         } else if (toktype == SPKM_WRAP_TOK) { /* Not Supported */
-                dprintk("RPC: gss_spkm3_seal: SPKM_WRAP_TOK not supported\n");
+                dprintk("RPC:       gss_spkm3_seal: SPKM_WRAP_TOK "
+                                "not supported\n");
                 goto out_err;
         }
 
@@ -153,7 +155,7 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header,
                         cksumname = "md5";
                         break;
                 default:
-                        dprintk("RPC:      spkm3_make_checksum:"
+                        dprintk("RPC:       spkm3_make_checksum:"
                                         " unsupported checksum %d", cksumtype);
                         return GSS_S_FAILURE;
         }
diff --git a/net/sunrpc/auth_gss/gss_spkm3_token.c b/net/sunrpc/auth_gss/gss_spkm3_token.c
index 35188b6ea8f7..156413ae6caf 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_token.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_token.c
@@ -209,7 +209,7 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
 
         /* spkm3 innercontext token preamble */
         if ((ptr[0] != 0xa4) || (ptr[2] != 0x30)) {
-                dprintk("RPC: BAD SPKM ictoken preamble\n"); 
+                dprintk("RPC:       BAD SPKM ictoken preamble\n");
                 goto out;
         }
 
@@ -217,25 +217,25 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
 
         /* token type */
         if ((ptr[4] != 0x02) || (ptr[5] != 0x02)) {
-                dprintk("RPC: BAD asn1 SPKM3 token type\n");
+                dprintk("RPC:       BAD asn1 SPKM3 token type\n");
                 goto out;
         }
 
         /* only support SPKM_MIC_TOK */
         if((ptr[6] != 0x01) || (ptr[7] != 0x01)) {
-                dprintk("RPC: ERROR unsupported SPKM3 token \n");
+                dprintk("RPC:       ERROR unsupported SPKM3 token \n");
                 goto out;
         }
 
         /* contextid */
         if (ptr[8] != 0x03) {
-                dprintk("RPC: BAD SPKM3 asn1 context-id type\n");
+                dprintk("RPC:       BAD SPKM3 asn1 context-id type\n");
                 goto out;
         }
 
         ctxelen = ptr[9];
         if (ctxelen > 17) {  /* length includes asn1 zbit octet */
-                dprintk("RPC: BAD SPKM3 contextid len %d\n", ctxelen);
+                dprintk("RPC:       BAD SPKM3 contextid len %d\n", ctxelen);
                 goto out;
         }
 
@@ -251,7 +251,9 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
         */
 
         if (*mic_hdrlen != 6 + ctxelen) {
-                dprintk("RPC: BAD SPKM_ MIC_TOK header len %d: we only support default int-alg (should be absent) and do not support snd-seq\n", *mic_hdrlen);
+                dprintk("RPC:       BAD SPKM_ MIC_TOK header len %d: we only "
+                                "support default int-alg (should be absent) "
+                                "and do not support snd-seq\n", *mic_hdrlen);
                 goto out;
         }
         /* checksum */
diff --git a/net/sunrpc/auth_gss/gss_spkm3_unseal.c b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
index e54581ca7570..ac1ad6b1dc4a 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_unseal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
@@ -72,7 +72,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
         /* decode the token */
 
         if (toktype != SPKM_MIC_TOK) {
-                dprintk("RPC: BAD SPKM3 token type: %d\n", toktype);
+                dprintk("RPC:       BAD SPKM3 token type: %d\n", toktype);
                 goto out;
         }
 
@@ -80,7 +80,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
                 goto out;
 
         if (*cksum++ != 0x03) {
-                dprintk("RPC: spkm3_read_token BAD checksum type\n");
+                dprintk("RPC:       spkm3_read_token BAD checksum type\n");
                 goto out;
         }
         md5elen = *cksum++;
@@ -97,7 +97,8 @@ spkm3_read_token(struct spkm3_ctx *ctx,
          */
         ret = GSS_S_DEFECTIVE_TOKEN;
         if (!g_OID_equal(&ctx->intg_alg, &hmac_md5_oid)) {
-                dprintk("RPC: gss_spkm3_seal: unsupported I-ALG algorithm\n");
+                dprintk("RPC:       gss_spkm3_seal: unsupported I-ALG "
+                                "algorithm\n");
                 goto out;
         }
 
@@ -113,7 +114,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
         ret = GSS_S_BAD_SIG;
         code = memcmp(md5cksum.data, wire_cksum.data, wire_cksum.len);
         if (code) {
-                dprintk("RPC: bad MIC checksum\n");
+                dprintk("RPC:       bad MIC checksum\n");
                 goto out;
         }
 
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 066c64a97fd8..8944cabcde56 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -669,14 +669,14 @@ gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
         }
 
         if (gc->gc_seq > MAXSEQ) {
-                dprintk("RPC:      svcauth_gss: discarding request with large sequence number %d\n",
-                                gc->gc_seq);
+                dprintk("RPC:       svcauth_gss: discarding request with "
+                                "large sequence number %d\n", gc->gc_seq);
                 *authp = rpcsec_gsserr_ctxproblem;
                 return SVC_DENIED;
         }
         if (!gss_check_seq_num(rsci, gc->gc_seq)) {
-                dprintk("RPC:      svcauth_gss: discarding request with old sequence number %d\n",
-                                gc->gc_seq);
+                dprintk("RPC:       svcauth_gss: discarding request with "
+                                "old sequence number %d\n", gc->gc_seq);
                 return SVC_DROP;
         }
         return SVC_OK;
@@ -958,7 +958,8 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
         __be32          *reject_stat = resv->iov_base + resv->iov_len;
         int             ret;
 
-        dprintk("RPC:      svcauth_gss: argv->iov_len = %zd\n",argv->iov_len);
+        dprintk("RPC:       svcauth_gss: argv->iov_len = %zd\n",
+                        argv->iov_len);
 
         *authp = rpc_autherr_badcred;
         if (!svcdata)