Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19bdd41a authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

adfs: add __printf verification, fix format/argument mismatches 



Might as well do the right thing.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b16214d4

fs/adfs/adfs.h

+1 −0
Original line number Diff line number Diff line
@@ -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);



/* Misc */

__printf(3, 4)

void __adfs_error(struct super_block *sb, const char *function,

		  const char *fmt, ...);

#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)

fs/adfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ adfs_dir_lookup_byname(struct inode *inode, struct qstr *name, struct object_inf 
		goto out;



	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);

		ret = -EIO;

		goto free_out;

fs/adfs/dir_fplus.c

+2 −3
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ adfs_fplus_read(struct super_block *sb, unsigned int id, unsigned int sz, struct 


		dir->bh_fplus[blk] = sb_bread(sb, block);

		if (!dir->bh_fplus[blk]) {

			adfs_error(sb,	"dir object %X failed read for"

					" offset %d, mapped block %X",

			adfs_error(sb,	"dir object %x failed read for offset %d, mapped block %lX",

				   id, blk, block);

			goto out;

		}