Commit e29136f8 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

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: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent c67d859e

fs/ext4/ext4.h

+7 −3
Original line number Diff line number Diff line
@@ -1639,9 +1639,13 @@ extern void __ext4_warning(struct super_block *, const char *, 
#define ext4_warning(sb, message...)	__ext4_warning(sb, __func__, ## message)

extern void ext4_msg(struct super_block *, const char *, const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

extern void ext4_grp_locked_error(struct super_block *, ext4_group_t,

				const char *, const char *, ...)

	__attribute__ ((format (printf, 4, 5)));

extern void __ext4_grp_locked_error(const char *, unsigned int, \

				    struct super_block *, ext4_group_t, \

				    unsigned long, ext4_fsblk_t, \

				    const char *, ...)

	__attribute__ ((format (printf, 7, 8)));

#define ext4_grp_locked_error(sb, grp, message...) \

	__ext4_grp_locked_error(__func__, __LINE__, (sb), (grp), ## message)

extern void ext4_update_dynamic_rev(struct super_block *sb);

extern int ext4_update_compat_feature(handle_t *handle, struct super_block *sb,

					__u32 compat);

fs/ext4/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ void ext4_da_update_reserve_space(struct inode *inode, 
		ext4_discard_preallocations(inode);

}



static int check_block_validity(struct inode *inode, const char *func,

static int __check_block_validity(struct inode *inode, const char *func,

				  struct ext4_map_blocks *map)

{

	if (!ext4_data_block_valid(EXT4_SB(inode->i_sb), map->m_pblk,
@@ -1142,6 +1142,9 @@ static int check_block_validity(struct inode *inode, const char *func, 
	return 0;

}



#define check_block_validity(inode, map)	\

	__check_block_validity((inode), __func__, (map))



/*

 * Return the number of contiguous dirty pages in a given inode

 * starting at page frame idx.
@@ -1244,7 +1247,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
	up_read((&EXT4_I(inode)->i_data_sem));



	if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {

		int ret = check_block_validity(inode, __func__, map);

		int ret = check_block_validity(inode, map);

		if (ret != 0)

			return ret;

	}
@@ -1324,9 +1327,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 


	up_write((&EXT4_I(inode)->i_data_sem));

	if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {

		int ret = check_block_validity(inode,

					       "ext4_map_blocks_after_alloc",

					       map);

		int ret = check_block_validity(inode, map);

		if (ret != 0)

			return ret;

	}

fs/ext4/mballoc.c

+21 −20
Original line number Diff line number Diff line
@@ -446,10 +446,11 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b, 
			blocknr = ext4_group_first_block_no(sb, e4b->bd_group);

			blocknr += first + i;

			ext4_grp_locked_error(sb, e4b->bd_group,

				   __func__, "double-free of inode"

				   " %lu's block %llu(bit %u in group %u)",

				   inode ? inode->i_ino : 0, blocknr,

				   first + i, e4b->bd_group);

					      inode ? inode->i_ino : 0,

					      blocknr,

					      "freeing block already freed "

					      "(bit %u)",

					      first + i);

		}

		mb_clear_bit(first + i, e4b->bd_info->bb_bitmap);

	}
@@ -712,9 +713,9 @@ void ext4_mb_generate_buddy(struct super_block *sb, 
	grp->bb_fragments = fragments;



	if (free != grp->bb_free) {

		ext4_grp_locked_error(sb, group,  __func__,

			"EXT4-fs: group %u: %u blocks in bitmap, %u in gd",

			group, free, grp->bb_free);

		ext4_grp_locked_error(sb, group, 0, 0,

				      "%u blocks in bitmap, %u in gd",

				      free, grp->bb_free);

		/*

		 * If we intent to continue, we consider group descritor

		 * corrupt and update bb_free using bitmap value
@@ -1296,10 +1297,10 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, 
			blocknr = ext4_group_first_block_no(sb, e4b->bd_group);

			blocknr += block;

			ext4_grp_locked_error(sb, e4b->bd_group,

				   __func__, "double-free of inode"

				   " %lu's block %llu(bit %u in group %u)",

				   inode ? inode->i_ino : 0, blocknr, block,

				   e4b->bd_group);

					      inode ? inode->i_ino : 0,

					      blocknr,

					      "freeing already freed block "

					      "(bit %u)", block);

		}

		mb_clear_bit(block, EXT4_MB_BITMAP(e4b));

		e4b->bd_info->bb_counters[order]++;
@@ -1788,8 +1789,8 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac, 
			 * free blocks even though group info says we

			 * we have free blocks

			 */

			ext4_grp_locked_error(sb, e4b->bd_group,

					__func__, "%d free blocks as per "

			ext4_grp_locked_error(sb, e4b->bd_group, 0, 0,

					"%d free blocks as per "

					"group info. But bitmap says 0",

					free);

			break;
@@ -1798,8 +1799,8 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac, 
		mb_find_extent(e4b, 0, i, ac->ac_g_ex.fe_len, &ex);

		BUG_ON(ex.fe_len <= 0);

		if (free < ex.fe_len) {

			ext4_grp_locked_error(sb, e4b->bd_group,

					__func__, "%d free blocks as per "

			ext4_grp_locked_error(sb, e4b->bd_group, 0, 0,

					"%d free blocks as per "

					"group info. But got %d blocks",

					free, ex.fe_len);

			/*
@@ -3584,8 +3585,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, 
			pa, (unsigned long) pa->pa_lstart,

			(unsigned long) pa->pa_pstart,

			(unsigned long) pa->pa_len);

		ext4_grp_locked_error(sb, group,

					__func__, "free %u, pa_free %u",

		ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",

					free, pa->pa_free);

		/*

		 * pa is already deleted so we use the value obtained
@@ -4395,6 +4395,7 @@ static noinline_for_stack int 
ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,

		      struct ext4_free_data *new_entry)

{

	ext4_group_t group = e4b->bd_group;

	ext4_grpblk_t block;

	struct ext4_free_data *entry;

	struct ext4_group_info *db = e4b->bd_info;
@@ -4427,9 +4428,9 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, 
		else if (block >= (entry->start_blk + entry->count))

			n = &(*n)->rb_right;

		else {

			ext4_grp_locked_error(sb, e4b->bd_group, __func__,

					"Double free of blocks %d (%d %d)",

					block, entry->start_blk, entry->count);

			ext4_grp_locked_error(sb, group, 0,

				ext4_group_first_block_no(sb, group) + block,

				"Block already on to-be-freed list");

			return 0;

		}

	}

fs/ext4/super.c

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