[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, 31 insertions, 30 deletions

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 1a528680ec5a..cf8bf69bd60c 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -49,7 +49,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
         struct mid_q_entry *temp;
 
         if (server == NULL) {
-                cERROR(1, "Null TCP session in AllocMidQEntry");
+                cifs_dbg(VFS, "Null TCP session in AllocMidQEntry\n");
                 return NULL;
         }
 
@@ -61,7 +61,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
                 temp->mid = smb_buffer->Mid;    /* always LE */
                 temp->pid = current->pid;
                 temp->command = cpu_to_le16(smb_buffer->Command);
-                cFYI(1, "For smb_command %d", smb_buffer->Command);
+                cifs_dbg(FYI, "For smb_command %d\n", smb_buffer->Command);
         /*      do_gettimeofday(&temp->when_sent);*/ /* easier to use jiffies */
                 /* when mid allocated can be before when sent */
                 temp->when_alloc = jiffies;
@@ -188,8 +188,8 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec,
                         WARN_ON_ONCE(rc == -ENOSPC);
                         i++;
                         if (i >= 14 || (!server->noblocksnd && (i > 2))) {
-                                cERROR(1, "sends on sock %p stuck for 15 "
-                                          "seconds", ssocket);
+                                cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",
+                                         ssocket);
                                 rc = -EAGAIN;
                                 break;
                         }
@@ -209,14 +209,14 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec,
                 }
 
                 if (rc > remaining) {
-                        cERROR(1, "sent %d requested %d", rc, remaining);
+                        cifs_dbg(VFS, "sent %d requested %d\n", rc, remaining);
                         break;
                 }
 
                 if (rc == 0) {
                         /* should never happen, letting socket clear before
                            retrying is our only obvious option here */
-                        cERROR(1, "tcp sent no data");
+                        cifs_dbg(VFS, "tcp sent no data\n");
                         msleep(500);
                         continue;
                 }
@@ -291,7 +291,7 @@ smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst)
         if (ssocket == NULL)
                 return -ENOTSOCK;
 
-        cFYI(1, "Sending smb: smb_len=%u", smb_buf_length);
+        cifs_dbg(FYI, "Sending smb: smb_len=%u\n", smb_buf_length);
         dump_smb(iov[0].iov_base, iov[0].iov_len);
 
         /* cork the socket */
@@ -324,8 +324,8 @@ uncork:
                                 (char *)&val, sizeof(val));
 
         if ((total_len > 0) && (total_len != smb_buf_length + 4)) {
-                cFYI(1, "partial send (wanted=%u sent=%zu): terminating "
-                        "session", smb_buf_length + 4, total_len);
+                cifs_dbg(FYI, "partial send (wanted=%u sent=%zu): terminating session\n",
+                         smb_buf_length + 4, total_len);
                 /*
                  * If we have only sent part of an SMB then the next SMB could
                  * be taken as the remainder of this one. We need to kill the
@@ -335,7 +335,8 @@ uncork:
         }
 
         if (rc < 0 && rc != -EINTR)
-                cERROR(1, "Error %d sending data on socket to server", rc);
+                cifs_dbg(VFS, "Error %d sending data on socket to server\n",
+                         rc);
         else
                 rc = 0;
 
@@ -427,7 +428,7 @@ static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
         }
 
         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;
         }
 
@@ -559,7 +560,7 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses,
         iov[0].iov_len = get_rfc1002_length(in_buf) + 4;
         flags |= CIFS_NO_RESP;
         rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags);
-        cFYI(DBG2, "SendRcvNoRsp flags %d rc %d", flags, rc);
+        cifs_dbg(NOISY, "SendRcvNoRsp flags %d rc %d\n", flags, rc);
 
         return rc;
 }
@@ -569,8 +570,8 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server)
 {
         int rc = 0;
 
-        cFYI(1, "%s: cmd=%d mid=%llu state=%d", __func__,
-             le16_to_cpu(mid->command), mid->mid, mid->mid_state);
+        cifs_dbg(FYI, "%s: cmd=%d mid=%llu state=%d\n",
+                 __func__, le16_to_cpu(mid->command), mid->mid, mid->mid_state);
 
         spin_lock(&GlobalMid_Lock);
         switch (mid->mid_state) {
@@ -588,8 +589,8 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server)
                 break;
         default:
                 list_del_init(&mid->qhead);
-                cERROR(1, "%s: invalid mid state mid=%llu state=%d", __func__,
-                       mid->mid, mid->mid_state);
+                cifs_dbg(VFS, "%s: invalid mid state mid=%llu state=%d\n",
+                         __func__, mid->mid, mid->mid_state);
                 rc = -EIO;
         }
         spin_unlock(&GlobalMid_Lock);
@@ -626,8 +627,8 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,
                 rc = cifs_verify_signature(&rqst, server,
                                            mid->sequence_number + 1);
                 if (rc)
-                        cERROR(1, "SMB signature verification returned error = "
-                               "%d", rc);
+                        cifs_dbg(VFS, "SMB signature verification returned error = %d\n",
+                                 rc);
         }
 
         /* BB special case reconnect tid and uid here? */
@@ -672,7 +673,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,
 
         if ((ses == NULL) || (ses->server == NULL)) {
                 cifs_small_buf_release(buf);
-                cERROR(1, "Null session");
+                cifs_dbg(VFS, "Null session\n");
                 return -EIO;
         }
 
@@ -752,7 +753,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,
 
         if (!midQ->resp_buf || midQ->mid_state != MID_RESPONSE_RECEIVED) {
                 rc = -EIO;
-                cFYI(1, "Bad MID state?");
+                cifs_dbg(FYI, "Bad MID state?\n");
                 goto out;
         }
 
@@ -788,11 +789,11 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
         struct mid_q_entry *midQ;
 
         if (ses == NULL) {
-                cERROR(1, "Null smb session");
+                cifs_dbg(VFS, "Null smb session\n");
                 return -EIO;
         }
         if (ses->server == NULL) {
-                cERROR(1, "Null tcp session");
+                cifs_dbg(VFS, "Null tcp session\n");
                 return -EIO;
         }
 
@@ -805,8 +806,8 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
 
         if (be32_to_cpu(in_buf->smb_buf_length) > CIFSMaxBufSize +
                         MAX_CIFS_HDR_SIZE - 4) {
-                cERROR(1, "Illegal length, greater than maximum frame, %d",
-                           be32_to_cpu(in_buf->smb_buf_length));
+                cifs_dbg(VFS, "Illegal length, greater than maximum frame, %d\n",
+                         be32_to_cpu(in_buf->smb_buf_length));
                 return -EIO;
         }
 
@@ -871,7 +872,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
         if (!midQ->resp_buf || !out_buf ||
             midQ->mid_state != MID_RESPONSE_RECEIVED) {
                 rc = -EIO;
-                cERROR(1, "Bad MID state?");
+                cifs_dbg(VFS, "Bad MID state?\n");
                 goto out;
         }
 
@@ -921,13 +922,13 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
         struct cifs_ses *ses;
 
         if (tcon == NULL || tcon->ses == NULL) {
-                cERROR(1, "Null smb session");
+                cifs_dbg(VFS, "Null smb session\n");
                 return -EIO;
         }
         ses = tcon->ses;
 
         if (ses->server == NULL) {
-                cERROR(1, "Null tcp session");
+                cifs_dbg(VFS, "Null tcp session\n");
                 return -EIO;
         }
 
@@ -940,8 +941,8 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
 
         if (be32_to_cpu(in_buf->smb_buf_length) > CIFSMaxBufSize +
                         MAX_CIFS_HDR_SIZE - 4) {
-                cERROR(1, "Illegal length, greater than maximum frame, %d",
-                           be32_to_cpu(in_buf->smb_buf_length));
+                cifs_dbg(VFS, "Illegal length, greater than maximum frame, %d\n",
+                         be32_to_cpu(in_buf->smb_buf_length));
                 return -EIO;
         }
 
@@ -1038,7 +1039,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
         /* rcvd frame is ok */
         if (out_buf == NULL || midQ->mid_state != MID_RESPONSE_RECEIVED) {
                 rc = -EIO;
-                cERROR(1, "Bad MID state?");
+                cifs_dbg(VFS, "Bad MID state?\n");
                 goto out;
         }