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

diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
index 42e5363b4102..2f4bc5a58054 100644
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
@@ -28,14 +28,14 @@ void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server)
         server->fscache =
                 fscache_acquire_cookie(cifs_fscache_netfs.primary_index,
                                 &cifs_fscache_server_index_def, server);
-        cFYI(1, "%s: (0x%p/0x%p)", __func__, server,
-                        server->fscache);
+        cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
+                 __func__, server, server->fscache);
 }
 
 void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server)
 {
-        cFYI(1, "%s: (0x%p/0x%p)", __func__, server,
-                        server->fscache);
+        cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
+                 __func__, server, server->fscache);
         fscache_relinquish_cookie(server->fscache, 0);
         server->fscache = NULL;
 }
@@ -47,13 +47,13 @@ void cifs_fscache_get_super_cookie(struct cifs_tcon *tcon)
         tcon->fscache =
                 fscache_acquire_cookie(server->fscache,
                                 &cifs_fscache_super_index_def, tcon);
-        cFYI(1, "%s: (0x%p/0x%p)", __func__, server->fscache,
-                        tcon->fscache);
+        cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
+                 __func__, server->fscache, tcon->fscache);
 }
 
 void cifs_fscache_release_super_cookie(struct cifs_tcon *tcon)
 {
-        cFYI(1, "%s: (0x%p)", __func__, tcon->fscache);
+        cifs_dbg(FYI, "%s: (0x%p)\n", __func__, tcon->fscache);
         fscache_relinquish_cookie(tcon->fscache, 0);
         tcon->fscache = NULL;
 }
@@ -70,8 +70,8 @@ static void cifs_fscache_enable_inode_cookie(struct inode *inode)
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE) {
                 cifsi->fscache = fscache_acquire_cookie(tcon->fscache,
                                 &cifs_fscache_inode_object_def, cifsi);
-                cFYI(1, "%s: got FH cookie (0x%p/0x%p)", __func__,
-                                tcon->fscache, cifsi->fscache);
+                cifs_dbg(FYI, "%s: got FH cookie (0x%p/0x%p)\n",
+                         __func__, tcon->fscache, cifsi->fscache);
         }
 }
 
@@ -80,7 +80,7 @@ void cifs_fscache_release_inode_cookie(struct inode *inode)
         struct cifsInodeInfo *cifsi = CIFS_I(inode);
 
         if (cifsi->fscache) {
-                cFYI(1, "%s: (0x%p)", __func__, cifsi->fscache);
+                cifs_dbg(FYI, "%s: (0x%p)\n", __func__, cifsi->fscache);
                 fscache_relinquish_cookie(cifsi->fscache, 0);
                 cifsi->fscache = NULL;
         }
@@ -91,7 +91,7 @@ static void cifs_fscache_disable_inode_cookie(struct inode *inode)
         struct cifsInodeInfo *cifsi = CIFS_I(inode);
 
         if (cifsi->fscache) {
-                cFYI(1, "%s: (0x%p)", __func__, cifsi->fscache);
+                cifs_dbg(FYI, "%s: (0x%p)\n", __func__, cifsi->fscache);
                 fscache_uncache_all_inode_pages(cifsi->fscache, inode);
                 fscache_relinquish_cookie(cifsi->fscache, 1);
                 cifsi->fscache = NULL;
@@ -120,8 +120,8 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode)
                                         cifs_sb_master_tcon(cifs_sb)->fscache,
                                         &cifs_fscache_inode_object_def,
                                         cifsi);
-                cFYI(1, "%s: new cookie 0x%p oldcookie 0x%p",
-                                __func__, cifsi->fscache, old);
+                cifs_dbg(FYI, "%s: new cookie 0x%p oldcookie 0x%p\n",
+                         __func__, cifsi->fscache, old);
         }
 }
 
@@ -131,8 +131,8 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp)
                 struct inode *inode = page->mapping->host;
                 struct cifsInodeInfo *cifsi = CIFS_I(inode);
 
-                cFYI(1, "%s: (0x%p/0x%p)", __func__, page,
-                                cifsi->fscache);
+                cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
+                         __func__, page, cifsi->fscache);
                 if (!fscache_maybe_release_page(cifsi->fscache, page, gfp))
                         return 0;
         }
@@ -143,7 +143,7 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp)
 static void cifs_readpage_from_fscache_complete(struct page *page, void *ctx,
                                                 int error)
 {
-        cFYI(1, "%s: (0x%p/%d)", __func__, page, error);
+        cifs_dbg(FYI, "%s: (0x%p/%d)\n", __func__, page, error);
         if (!error)
                 SetPageUptodate(page);
         unlock_page(page);
@@ -156,8 +156,8 @@ int __cifs_readpage_from_fscache(struct inode *inode, struct page *page)
 {
         int ret;
 
-        cFYI(1, "%s: (fsc:%p, p:%p, i:0x%p", __func__,
-                        CIFS_I(inode)->fscache, page, inode);
+        cifs_dbg(FYI, "%s: (fsc:%p, p:%p, i:0x%p\n",
+                 __func__, CIFS_I(inode)->fscache, page, inode);
         ret = fscache_read_or_alloc_page(CIFS_I(inode)->fscache, page,
                                          cifs_readpage_from_fscache_complete,
                                          NULL,
@@ -165,15 +165,15 @@ int __cifs_readpage_from_fscache(struct inode *inode, struct page *page)
         switch (ret) {
 
         case 0: /* page found in fscache, read submitted */
-                cFYI(1, "%s: submitted", __func__);
+                cifs_dbg(FYI, "%s: submitted\n", __func__);
                 return ret;
         case -ENOBUFS:  /* page won't be cached */
         case -ENODATA:  /* page not in cache */
-                cFYI(1, "%s: %d", __func__, ret);
+                cifs_dbg(FYI, "%s: %d\n", __func__, ret);
                 return 1;
 
         default:
-                cERROR(1, "unknown error ret = %d", ret);
+                cifs_dbg(VFS, "unknown error ret = %d\n", ret);
         }
         return ret;
 }
@@ -188,8 +188,8 @@ int __cifs_readpages_from_fscache(struct inode *inode,
 {
         int ret;
 
-        cFYI(1, "%s: (0x%p/%u/0x%p)", __func__,
-                        CIFS_I(inode)->fscache, *nr_pages, inode);
+        cifs_dbg(FYI, "%s: (0x%p/%u/0x%p)\n",
+                 __func__, CIFS_I(inode)->fscache, *nr_pages, inode);
         ret = fscache_read_or_alloc_pages(CIFS_I(inode)->fscache, mapping,
                                           pages, nr_pages,
                                           cifs_readpage_from_fscache_complete,
@@ -197,16 +197,16 @@ int __cifs_readpages_from_fscache(struct inode *inode,
                                           mapping_gfp_mask(mapping));
         switch (ret) {
         case 0: /* read submitted to the cache for all pages */
-                cFYI(1, "%s: submitted", __func__);
+                cifs_dbg(FYI, "%s: submitted\n", __func__);
                 return ret;
 
         case -ENOBUFS:  /* some pages are not cached and can't be */
         case -ENODATA:  /* some pages are not cached */
-                cFYI(1, "%s: no page", __func__);
+                cifs_dbg(FYI, "%s: no page\n", __func__);
                 return 1;
 
         default:
-                cFYI(1, "unknown error ret = %d", ret);
+                cifs_dbg(FYI, "unknown error ret = %d\n", ret);
         }
 
         return ret;
@@ -216,8 +216,8 @@ void __cifs_readpage_to_fscache(struct inode *inode, struct page *page)
 {
         int ret;
 
-        cFYI(1, "%s: (fsc: %p, p: %p, i: %p)", __func__,
-                        CIFS_I(inode)->fscache, page, inode);
+        cifs_dbg(FYI, "%s: (fsc: %p, p: %p, i: %p)\n",
+                 __func__, CIFS_I(inode)->fscache, page, inode);
         ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL);
         if (ret != 0)
                 fscache_uncache_page(CIFS_I(inode)->fscache, page);
@@ -228,7 +228,7 @@ void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode)
         struct cifsInodeInfo *cifsi = CIFS_I(inode);
         struct fscache_cookie *cookie = cifsi->fscache;
 
-        cFYI(1, "%s: (0x%p/0x%p)", __func__, page, cookie);
+        cifs_dbg(FYI, "%s: (0x%p/0x%p)\n", __func__, page, cookie);
         fscache_wait_on_page_write(cookie, page);
         fscache_uncache_page(cookie, page);
 }