1 files changed, 25 insertions, 49 deletions

diff --git a/fs/befs/debug.c b/fs/befs/debug.c
index 622e73775c83..4de7cffcd662 100644
--- a/fs/befs/debug.c
+++ b/fs/befs/debug.c
@@ -10,6 +10,7 @@
  * debug functions
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #ifdef __KERNEL__
 
 #include <stdarg.h>
@@ -23,43 +24,30 @@
 
 #include "befs.h"
 
-#define ERRBUFSIZE 1024
-
 void
 befs_error(const struct super_block *sb, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
-        char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
-        if (err_buf == NULL) {
-                printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
-                return;
-        }
 
         va_start(args, fmt);
-        vsnprintf(err_buf, ERRBUFSIZE, fmt, args);
+        vaf.fmt = fmt;
+        vaf.va = &args;
+        pr_err("(%s): %pV\n", sb->s_id, &vaf);
         va_end(args);
-
-        printk(KERN_ERR "BeFS(%s): %s\n", sb->s_id, err_buf);
-        kfree(err_buf);
 }
 
 void
 befs_warning(const struct super_block *sb, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
-        char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
-        if (err_buf == NULL) {
-                printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
-                return;
-        }
 
         va_start(args, fmt);
-        vsnprintf(err_buf, ERRBUFSIZE, fmt, args);
+        vaf.fmt = fmt;
+        vaf.va = &args;
+        pr_warn("(%s): %pV\n", sb->s_id, &vaf);
         va_end(args);
-
-        printk(KERN_WARNING "BeFS(%s): %s\n", sb->s_id, err_buf);
-
-        kfree(err_buf);
 }
 
 void
@@ -67,25 +55,13 @@ befs_debug(const struct super_block *sb, const char *fmt, ...)
 {
 #ifdef CONFIG_BEFS_DEBUG
 
+        struct va_format vaf;
         va_list args;
-        char *err_buf = NULL;
-
-        if (BEFS_SB(sb)->mount_opts.debug) {
-                err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
-                if (err_buf == NULL) {
-                        printk(KERN_ERR "could not allocate %d bytes\n",
-                                ERRBUFSIZE);
-                        return;
-                }
-
-                va_start(args, fmt);
-                vsnprintf(err_buf, ERRBUFSIZE, fmt, args);
-                va_end(args);
-
-                printk(KERN_DEBUG "BeFS(%s): %s\n", sb->s_id, err_buf);
-
-                kfree(err_buf);
-        }
+        va_start(args, fmt);
+        vaf.fmt = fmt;
+        vaf.va = &args;
+        pr_debug("(%s): %pV\n", sb->s_id, &vaf);
+        va_end(args);
 
 #endif                          //CONFIG_BEFS_DEBUG
 }
@@ -109,9 +85,9 @@ befs_dump_inode(const struct super_block *sb, befs_inode * inode)
         befs_debug(sb, "  gid %u", fs32_to_cpu(sb, inode->gid));
         befs_debug(sb, "  mode %08x", fs32_to_cpu(sb, inode->mode));
         befs_debug(sb, "  flags %08x", fs32_to_cpu(sb, inode->flags));
-        befs_debug(sb, "  create_time %Lu",
+        befs_debug(sb, "  create_time %llu",
                    fs64_to_cpu(sb, inode->create_time));
-        befs_debug(sb, "  last_modified_time %Lu",
+        befs_debug(sb, "  last_modified_time %llu",
                    fs64_to_cpu(sb, inode->last_modified_time));
 
         tmp_run = fsrun_to_cpu(sb, inode->parent);
@@ -137,7 +113,7 @@ befs_dump_inode(const struct super_block *sb, befs_inode * inode)
                                    tmp_run.allocation_group, tmp_run.start,
                                    tmp_run.len);
                 }
-                befs_debug(sb, "  max_direct_range %Lu",
+                befs_debug(sb, "  max_direct_range %llu",
                            fs64_to_cpu(sb,
                                        inode->data.datastream.
                                        max_direct_range));
@@ -147,7 +123,7 @@ befs_dump_inode(const struct super_block *sb, befs_inode * inode)
                            tmp_run.allocation_group,
                            tmp_run.start, tmp_run.len);
 
-                befs_debug(sb, "  max_indirect_range %Lu",
+                befs_debug(sb, "  max_indirect_range %llu",
                            fs64_to_cpu(sb,
                                        inode->data.datastream.
                                        max_indirect_range));
@@ -158,12 +134,12 @@ befs_dump_inode(const struct super_block *sb, befs_inode * inode)
                            tmp_run.allocation_group, tmp_run.start,
                            tmp_run.len);
 
-                befs_debug(sb, "  max_double_indirect_range %Lu",
+                befs_debug(sb, "  max_double_indirect_range %llu",
                            fs64_to_cpu(sb,
                                        inode->data.datastream.
                                        max_double_indirect_range));
 
-                befs_debug(sb, "  size %Lu",
+                befs_debug(sb, "  size %llu",
                            fs64_to_cpu(sb, inode->data.datastream.size));
         }
 
@@ -191,8 +167,8 @@ befs_dump_super_block(const struct super_block *sb, befs_super_block * sup)
         befs_debug(sb, "  block_size %u", fs32_to_cpu(sb, sup->block_size));
         befs_debug(sb, "  block_shift %u", fs32_to_cpu(sb, sup->block_shift));
 
-        befs_debug(sb, "  num_blocks %Lu", fs64_to_cpu(sb, sup->num_blocks));
-        befs_debug(sb, "  used_blocks %Lu", fs64_to_cpu(sb, sup->used_blocks));
+        befs_debug(sb, "  num_blocks %llu", fs64_to_cpu(sb, sup->num_blocks));
+        befs_debug(sb, "  used_blocks %llu", fs64_to_cpu(sb, sup->used_blocks));
 
         befs_debug(sb, "  magic2 %08x", fs32_to_cpu(sb, sup->magic2));
         befs_debug(sb, "  blocks_per_ag %u",
@@ -206,8 +182,8 @@ befs_dump_super_block(const struct super_block *sb, befs_super_block * sup)
         befs_debug(sb, "  log_blocks %u, %hu, %hu",
                    tmp_run.allocation_group, tmp_run.start, tmp_run.len);
 
-        befs_debug(sb, "  log_start %Ld", fs64_to_cpu(sb, sup->log_start));
-        befs_debug(sb, "  log_end %Ld", fs64_to_cpu(sb, sup->log_end));
+        befs_debug(sb, "  log_start %lld", fs64_to_cpu(sb, sup->log_start));
+        befs_debug(sb, "  log_end %lld", fs64_to_cpu(sb, sup->log_end));
 
         befs_debug(sb, "  magic3 %08x", fs32_to_cpu(sb, sup->magic3));