leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] hpfs: bring hpfs_error() into shape

Browse Source 
- switch to error message buffer in .bss
 - missing va_end() (htf it worked before?)
 - use vsnprintf()
 - rename variables to understandable "fmt", "args".
 - "const char *fmt", yes.
 - add __attribute__((format ...

Still, put that coffee down before reading more.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan 2006-12-06 20:37:04 -08:00 committed by Linus Torvalds
parent 4a6e617a4b
commit 352d94d040
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/hpfs/hpfs_fn.h
View File

@ -317,7 +317,8 @@ static inline struct hpfs_sb_info *hpfs_sb(struct super_block *sb)
/* super.c */
void hpfs_error(struct super_block *, char *, ...);
void hpfs_error(struct super_block *, const char *, ...)
__attribute__((format (printf, 2, 3)));
int hpfs_stop_cycles(struct super_block *, int, int *, int *, char *);
unsigned hpfs_count_one_bitmap(struct super_block *, secno);

23
fs/hpfs/super.c
View File

@ -46,21 +46,17 @@ static void unmark_dirty(struct super_block *s)
}
/* Filesystem error... */
static char err_buf[1024];
#define ERR_BUF_SIZE 1024
void hpfs_error(struct super_block *s, char *m,...)
void hpfs_error(struct super_block *s, const char *fmt, ...)
{
char *buf;
va_list l;
va_start(l, m);
if (!(buf = kmalloc(ERR_BUF_SIZE, GFP_KERNEL)))
printk("HPFS: No memory for error message '%s'\n",m);
else if (vsprintf(buf, m, l) >= ERR_BUF_SIZE)
printk("HPFS: Grrrr... Kernel memory corrupted ... going on, but it'll crash very soon :-(\n");
printk("HPFS: filesystem error: ");
if (buf) printk("%s", buf);
else printk("%s\n",m);
va_list args;
va_start(args, fmt);
vsnprintf(err_buf, sizeof(err_buf), fmt, args);
va_end(args);
printk("HPFS: filesystem error: %s", err_buf);
if (!hpfs_sb(s)->sb_was_error) {
if (hpfs_sb(s)->sb_err == 2) {
printk("; crashing the system because you wanted it\n");
@ -76,7 +72,6 @@ void hpfs_error(struct super_block *s, char *m,...)
} else if (s->s_flags & MS_RDONLY) printk("; going on - but anything won't be destroyed because it's read-only\n");
else printk("; corrupted filesystem mounted read/write - your computer will explode within 20 seconds ... but you wanted it so!\n");
} else printk("\n");
kfree(buf);
hpfs_sb(s)->sb_was_error = 1;
}