lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: add no_printk argument validation, fix fallout

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

Fix format and argument mismatches.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Joe Perches
2012-03-19 23:11:43 -04:00
committed by Theodore Ts'o
parent 7f6a11e73d
commit ace36ad431
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/ext4.h
View File

@@ -53,7 +53,7 @@
printk(KERN_DEBUG f, ## a); \ printk(KERN_DEBUG f, ## a); \
} while (0) } while (0)
#else #else
#define ext4_debug(f, a...) do {} while (0) #define ext4_debug(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif #endif
#define EXT4_ERROR_INODE(inode, fmt, a...) \ #define EXT4_ERROR_INODE(inode, fmt, a...) \

4
fs/ext4/ext4_extents.h
View File

@@ -47,9 +47,9 @@
*/ */
#define EXT_DEBUG__ #define EXT_DEBUG__
#ifdef EXT_DEBUG #ifdef EXT_DEBUG
#define ext_debug(a...) printk(a) #define ext_debug(fmt, ...) printk(fmt, ##__VA_ARGS__)
#else #else
#define ext_debug(a...) #define ext_debug(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif #endif
/* /*

2
fs/ext4/inode.c
View File

@@ -2764,7 +2764,7 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
goto out; goto out;
ext_debug("ext4_end_io_dio(): io_end 0x%p " 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, iocb->private, io_end->inode->i_ino, iocb, offset,
size); size);

13
fs/ext4/xattr.c
View File

@@ -82,8 +82,8 @@
printk("\n"); \ printk("\n"); \
} while (0) } while (0)
#else #else
# define ea_idebug(f...) # define ea_idebug(inode, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
# define ea_bdebug(f...) # define ea_bdebug(bh, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif #endif
static void ext4_xattr_cache_insert(struct buffer_head *); 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; error = -ENODATA;
if (!EXT4_I(inode)->i_file_acl) if (!EXT4_I(inode)->i_file_acl)
goto cleanup; 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); bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
if (!bh) if (!bh)
goto cleanup; goto cleanup;
@@ -360,7 +361,8 @@ ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size)
error = 0; error = 0;
if (!EXT4_I(inode)->i_file_acl) if (!EXT4_I(inode)->i_file_acl)
goto cleanup; 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); bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
error = -EIO; error = -EIO;
if (!bh) if (!bh)
@@ -832,7 +834,8 @@ inserted:
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
BUG_ON(block > EXT4_MAX_BLOCK_FILE_PHYS); 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); new_bh = sb_getblk(sb, block);
if (!new_bh) { if (!new_bh) {