jfs: Update jfs_error

Use a more current logging style.

Add __printf format and argument verification.

Remove embedded function names from formats.
Add %pf, __builtin_return_address(0) to jfs_error.
Add newlines to formats for kernel style consistency.
(One format already had an erroneous newline)
Coalesce formats and align arguments.

Object size reduced ~1KiB.

$ size fs/jfs/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 201891	  35488	  63936	 301315	  49903	fs/jfs/built-in.o.new
 202821	  35488	  64192	 302501	  49da5	fs/jfs/built-in.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>

1 files changed, 13 insertions, 9 deletions

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 788e0a9c1fb0..6669aa2042c3 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -92,16 +92,20 @@ static void jfs_handle_error(struct super_block *sb)
         /* nothing is done for continue beyond marking the superblock dirty */
 }
 
-void jfs_error(struct super_block *sb, const char * function, ...)
+void jfs_error(struct super_block *sb, const char *fmt, ...)
 {
-        static char error_buf[256];
+        struct va_format vaf;
         va_list args;
 
-        va_start(args, function);
-        vsnprintf(error_buf, sizeof(error_buf), function, args);
-        va_end(args);
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
 
-        pr_err("ERROR: (device %s): %s\n", sb->s_id, error_buf);
+        pr_err("ERROR: (device %s): %pf: %pV\n",
+               sb->s_id, __builtin_return_address(0), &vaf);
+
+        va_end(args);
 
         jfs_handle_error(sb);
 }
@@ -617,7 +621,7 @@ static int jfs_freeze(struct super_block *sb)
                 txQuiesce(sb);
                 rc = lmLogShutdown(log);
                 if (rc) {
-                        jfs_error(sb, "jfs_freeze: lmLogShutdown failed");
+                        jfs_error(sb, "lmLogShutdown failed\n");
 
                         /* let operations fail rather than hang */
                         txResume(sb);
@@ -646,12 +650,12 @@ static int jfs_unfreeze(struct super_block *sb)
         if (!(sb->s_flags & MS_RDONLY)) {
                 rc = updateSuper(sb, FM_MOUNT);
                 if (rc) {
-                        jfs_error(sb, "jfs_unfreeze: updateSuper failed");
+                        jfs_error(sb, "updateSuper failed\n");
                         goto out;
                 }
                 rc = lmLogInit(log);
                 if (rc)
-                        jfs_error(sb, "jfs_unfreeze: lmLogInit failed");
+                        jfs_error(sb, "lmLogInit failed\n");
 out:
                 txResume(sb);
         }