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

Commit ace36ad4 authored by Joe Perches's avatar Joe Perches Committed by Theodore Ts'o
Browse files

ext4: add no_printk argument validation, fix fallout 



Add argument validation to debug functions.
Use ##__VA_ARGS__.

Fix format and argument mismatches.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 7f6a11e7

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		printk(KERN_DEBUG f, ## a);				\

	} while (0)

#else

#define ext4_debug(f, a...)	do {} while (0)

#define ext4_debug(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



#define EXT4_ERROR_INODE(inode, fmt, a...) \

fs/ext4/ext4_extents.h

+2 −2
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
 */

#define EXT_DEBUG__

#ifdef EXT_DEBUG

#define ext_debug(a...)		printk(a)

#define ext_debug(fmt, ...)	printk(fmt, ##__VA_ARGS__)

#else

#define ext_debug(a...)

#define ext_debug(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/*

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2764,7 +2764,7 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset, 
		goto out;



	ext_debug("ext4_end_io_dio(): io_end 0x%p "

		  "for inode %lu, iocb 0x%p, offset %llu, size %llu\n",

		  "for inode %lu, iocb 0x%p, offset %llu, size %zd\n",

 		  iocb->private, io_end->inode->i_ino, iocb, offset,

		  size);

fs/ext4/xattr.c

+8 −5
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ 
		printk("\n"); \

	} while (0)

#else

# define ea_idebug(f...)

# define ea_bdebug(f...)

# define ea_idebug(inode, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

# define ea_bdebug(bh, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



static void ext4_xattr_cache_insert(struct buffer_head *);
@@ -217,7 +217,8 @@ ext4_xattr_block_get(struct inode *inode, int name_index, const char *name, 
	error = -ENODATA;

	if (!EXT4_I(inode)->i_file_acl)

		goto cleanup;

	ea_idebug(inode, "reading block %u", EXT4_I(inode)->i_file_acl);

	ea_idebug(inode, "reading block %llu",

		  (unsigned long long)EXT4_I(inode)->i_file_acl);

	bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);

	if (!bh)

		goto cleanup;
@@ -360,7 +361,8 @@ ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
	error = 0;

	if (!EXT4_I(inode)->i_file_acl)

		goto cleanup;

	ea_idebug(inode, "reading block %u", EXT4_I(inode)->i_file_acl);

	ea_idebug(inode, "reading block %llu",

		  (unsigned long long)EXT4_I(inode)->i_file_acl);

	bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);

	error = -EIO;

	if (!bh)
@@ -832,7 +834,8 @@ inserted: 
			if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))

				BUG_ON(block > EXT4_MAX_BLOCK_FILE_PHYS);



			ea_idebug(inode, "creating block %d", block);

			ea_idebug(inode, "creating block %llu",

				  (unsigned long long)block);



			new_bh = sb_getblk(sb, block);

			if (!new_bh) {