diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-06-29 12:54:28 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-06-29 12:54:28 -0400 |
| commit | e29136f80e775b0310273932b4297a62f5574a29 (patch) | |
| tree | d10d56b15b7968744ea0becdf61440aae7e609c5 /fs/ext4/super.c | |
| parent | c67d859e39896e4286249da89c4ca0ef8bd949cb (diff) | |
| download | linux-3.10-e29136f80e775b0310273932b4297a62f5574a29.tar.gz linux-3.10-e29136f80e775b0310273932b4297a62f5574a29.tar.bz2 linux-3.10-e29136f80e775b0310273932b4297a62f5574a29.zip | |
ext4: Enhance ext4_grp_locked_error() to take block and function numbers
Also use a macro definition so that __func__ and __LINE__ is implicit.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 11441e483b6..39aeb454bf2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -514,8 +514,10 @@ void __ext4_warning(struct super_block *sb, const char *function, va_end(args); } -void ext4_grp_locked_error(struct super_block *sb, ext4_group_t grp, - const char *function, const char *fmt, ...) +void __ext4_grp_locked_error(const char *function, unsigned int line, + struct super_block *sb, ext4_group_t grp, + unsigned long ino, ext4_fsblk_t block, + const char *fmt, ...) __releases(bitlock) __acquires(bitlock) { @@ -523,7 +525,12 @@ __acquires(bitlock) struct ext4_super_block *es = EXT4_SB(sb)->s_es; va_start(args, fmt); - printk(KERN_CRIT "EXT4-fs error (device %s): %s: ", sb->s_id, function); + printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: group %u", + sb->s_id, function, line, grp); + if (ino) + printk("inode %lu: ", ino); + if (block) + printk("block %llu:", (unsigned long long) block); vprintk(fmt, args); printk("\n"); va_end(args); |