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>

1 files changed, 8 insertions, 6 deletions

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;
         }