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

adfs: add __printf verification, fix format/argument mismatches

Browse Source 
Might as well do the right thing.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2014-08-08 14:22:26 -07:00 committed by Linus Torvalds
parent b16214d43d
commit 19bdd41a57
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/adfs/adfs.h
View File

@ -153,6 +153,7 @@ extern int adfs_map_lookup(struct super_block *sb, unsigned int frag_id, unsigne
extern unsigned int adfs_map_free(struct super_block *sb); extern unsigned int adfs_map_free(struct super_block *sb);
/* Misc */ /* Misc */
__printf(3, 4)
void __adfs_error(struct super_block *sb, const char *function, void __adfs_error(struct super_block *sb, const char *function,
const char *fmt, ...); const char *fmt, ...);
#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt) #define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)

2
fs/adfs/dir.c
View File

@ -138,7 +138,7 @@ adfs_dir_lookup_byname(struct inode *inode, struct qstr *name, struct object_inf
goto out; goto out;
if (ADFS_I(inode)->parent_id != dir.parent_id) { if (ADFS_I(inode)->parent_id != dir.parent_id) {
adfs_error(sb, "parent directory changed under me! (%lx but got %lx)\n", adfs_error(sb, "parent directory changed under me! (%lx but got %x)\n",
ADFS_I(inode)->parent_id, dir.parent_id); ADFS_I(inode)->parent_id, dir.parent_id);
ret = -EIO; ret = -EIO;
goto free_out; goto free_out;

5
fs/adfs/dir_fplus.c
View File

@ -79,9 +79,8 @@ adfs_fplus_read(struct super_block *sb, unsigned int id, unsigned int sz, struct
dir->bh_fplus[blk] = sb_bread(sb, block); dir->bh_fplus[blk] = sb_bread(sb, block);
if (!dir->bh_fplus[blk]) { if (!dir->bh_fplus[blk]) {
adfs_error(sb, "dir object %X failed read for" adfs_error(sb, "dir object %x failed read for offset %d, mapped block %lX",
" offset %d, mapped block %X", id, blk, block);
id, blk, block);
goto out; goto out;
} }