Merge git://git.kvack.org/~bcrl/aio-next

[cascardo/linux.git] / fs / affs / amigaffs.c

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 937ce87..c852f2f 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -10,8 +10,6 @@
 
 #include "affs.h"
 
-static char ErrorBuffer[256];
-
 /*
  * Functions for accessing Amiga-FFS structures.
  */
@@ -444,30 +442,30 @@ mode_to_prot(struct inode *inode)
 void
 affs_error(struct super_block *sb, const char *function, const char *fmt, ...)
 {
-       va_list  args;
-
-       va_start(args,fmt);
-       vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
-       va_end(args);
+       struct va_format vaf;
+       va_list args;
 
-       pr_crit("error (device %s): %s(): %s\n", sb->s_id,
-               function,ErrorBuffer);
+       va_start(args, fmt);
+       vaf.fmt = fmt;
+       vaf.va = &args;
+       pr_crit("error (device %s): %s(): %pV\n", sb->s_id, function, &vaf);
        if (!(sb->s_flags & MS_RDONLY))
                pr_warn("Remounting filesystem read-only\n");
        sb->s_flags |= MS_RDONLY;
+       va_end(args);
 }
 
 void
 affs_warning(struct super_block *sb, const char *function, const char *fmt, ...)
 {
-       va_list  args;
+       struct va_format vaf;
+       va_list args;
 
-       va_start(args,fmt);
-       vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
+       va_start(args, fmt);
+       vaf.fmt = fmt;
+       vaf.va = &args;
+       pr_warn("(device %s): %s(): %pV\n", sb->s_id, function, &vaf);
        va_end(args);
-
-       pr_warn("(device %s): %s(): %s\n", sb->s_id,
-               function,ErrorBuffer);
 }
 
 bool