[CIFS] cifs: Rename cERROR and cFYI to cifs_dbg

It's not obvious from reading the macro names that these macros
are for debugging.  Convert the names to a single more typical
kernel style cifs_dbg macro.

	cERROR(1, ...)   -> cifs_dbg(VFS, ...)
	cFYI(1, ...)     -> cifs_dbg(FYI, ...)
	cFYI(DBG2, ...)  -> cifs_dbg(NOISY, ...)

Move the terminating format newline from the macro to the call site.

Add CONFIG_CIFS_DEBUG function cifs_vfs_err to emit the
"CIFS VFS: " prefix for VFS messages.

Size is reduced ~ 1% when CONFIG_CIFS_DEBUG is set (default y)

$ size fs/cifs/cifs.ko*
   text    data     bss     dec     hex filename
 265245	   2525	    132	 267902	  4167e	fs/cifs/cifs.ko.new
 268359    2525     132  271016   422a8 fs/cifs/cifs.ko.old

Other miscellaneous changes around these conversions:

o Miscellaneous typo fixes
o Add terminating \n's to almost all formats and remove them
  from the macros to be more kernel style like.  A few formats
  previously had defective \n's
o Remove unnecessary OOM messages as kmalloc() calls dump_stack
o Coalesce formats to make grep easier,
  added missing spaces when coalescing formats
o Use %s, __func__ instead of embedded function name
o Removed unnecessary "cifs: " prefixes
o Convert kzalloc with multiply to kcalloc
o Remove unused cifswarn macro

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
index 8dd73e61d762..01f0ac800780 100644
--- a/fs/cifs/smb2transport.c
+++ b/fs/cifs/smb2transport.c
@@ -55,13 +55,13 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
         rc = crypto_shash_setkey(server->secmech.hmacsha256,
                 server->session_key.response, SMB2_NTLMV2_SESSKEY_SIZE);
         if (rc) {
-                cERROR(1, "%s: Could not update with response\n", __func__);
+                cifs_dbg(VFS, "%s: Could not update with response\n", __func__);
                 return rc;
         }
 
         rc = crypto_shash_init(&server->secmech.sdeschmacsha256->shash);
         if (rc) {
-                cERROR(1, "%s: Could not init md5\n", __func__);
+                cifs_dbg(VFS, "%s: Could not init md5\n", __func__);
                 return rc;
         }
 
@@ -69,7 +69,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
                 if (iov[i].iov_len == 0)
                         continue;
                 if (iov[i].iov_base == NULL) {
-                        cERROR(1, "null iovec entry");
+                        cifs_dbg(VFS, "null iovec entry\n");
                         return -EIO;
                 }
                 /*
@@ -90,8 +90,8 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
                                 iov[i].iov_base, iov[i].iov_len);
                 }
                 if (rc) {
-                        cERROR(1, "%s: Could not update with payload\n",
-                                                        __func__);
+                        cifs_dbg(VFS, "%s: Could not update with payload\n",
+                                 __func__);
                         return rc;
                 }
         }
@@ -109,7 +109,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
         rc = crypto_shash_final(&server->secmech.sdeschmacsha256->shash,
                                 sigptr);
         if (rc)
-                cERROR(1, "%s: Could not generate sha256 hash\n", __func__);
+                cifs_dbg(VFS, "%s: Could not generate sha256 hash\n", __func__);
 
         memcpy(smb2_pdu->Signature, sigptr, SMB2_SIGNATURE_SIZE);
 
@@ -119,7 +119,7 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
 int
 smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
 {
-        cFYI(1, "smb3 signatures not supported yet");
+        cifs_dbg(FYI, "smb3 signatures not supported yet\n");
         return -EOPNOTSUPP;
 }
 
@@ -163,8 +163,8 @@ smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
 
         /* Do not need to verify session setups with signature "BSRSPYL " */
         if (memcmp(smb2_pdu->Signature, "BSRSPYL ", 8) == 0)
-                cFYI(1, "dummy signature received for smb command 0x%x",
-                        smb2_pdu->Command);
+                cifs_dbg(FYI, "dummy signature received for smb command 0x%x\n",
+                         smb2_pdu->Command);
 
         /*
          * Save off the origiginal signature so we can modify the smb and check
@@ -205,7 +205,7 @@ smb2_mid_entry_alloc(const struct smb2_hdr *smb_buffer,
         struct mid_q_entry *temp;
 
         if (server == NULL) {
-                cERROR(1, "Null TCP session in smb2_mid_entry_alloc");
+                cifs_dbg(VFS, "Null TCP session in smb2_mid_entry_alloc\n");
                 return NULL;
         }
 
@@ -241,7 +241,7 @@ smb2_get_mid_entry(struct cifs_ses *ses, struct smb2_hdr *buf,
                 return -ENOENT;
 
         if (ses->server->tcpStatus == CifsNeedReconnect) {
-                cFYI(1, "tcp session dead - return to caller to retry");
+                cifs_dbg(FYI, "tcp session dead - return to caller to retry\n");
                 return -EAGAIN;
         }
 
@@ -281,8 +281,8 @@ smb2_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,
 
                 rc = smb2_verify_signature(&rqst, server);
                 if (rc)
-                        cERROR(1, "SMB signature verification returned error = "
-                               "%d", rc);
+                        cifs_dbg(VFS, "SMB signature verification returned error = %d\n",
+                                 rc);
         }
 
         return map_smb2_to_linux_error(mid->resp_buf, log_error);