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

Commit c549a95d authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: fix up EXT4FS_DEBUG builds 



Builds with EXT4FS_DEBUG defined (to enable ext4_debug()) fail
without these changes.  Clean up some format warnings too.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
parent aa22df2c

fs/ext4/balloc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1630,7 +1630,7 @@ ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, 




	sbi = EXT4_SB(sb);

	sbi = EXT4_SB(sb);

	es = EXT4_SB(sb)->s_es;

	es = EXT4_SB(sb)->s_es;

	ext4_debug("goal=%lu.\n", goal);

	ext4_debug("goal=%llu.\n", goal);

	/*

	/*

	 * Allocate a block from reservation only when

	 * Allocate a block from reservation only when

	 * filesystem is mounted with reservation(default,-o reservation), and

	 * filesystem is mounted with reservation(default,-o reservation), and
@@ -1740,7 +1740,7 @@ retry_alloc: 




allocated:

allocated:





	ext4_debug("using block group %d(%d)\n",

	ext4_debug("using block group %lu(%d)\n",

			group_no, gdp->bg_free_blocks_count);

			group_no, gdp->bg_free_blocks_count);





	BUFFER_TRACE(gdp_bh, "get_write_access");

	BUFFER_TRACE(gdp_bh, "get_write_access");
@@ -1898,7 +1898,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) 
	brelse(bitmap_bh);

	brelse(bitmap_bh);

	printk("ext4_count_free_blocks: stored = %llu"

	printk("ext4_count_free_blocks: stored = %llu"

		", computed = %llu, %llu\n",

		", computed = %llu, %llu\n",

	       EXT4_FREE_BLOCKS_COUNT(es),

		ext4_free_blocks_count(es),

		desc_count, bitmap_count);

		desc_count, bitmap_count);

	return bitmap_count;

	return bitmap_count;

#else

#else

fs/ext4/ialloc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -857,7 +857,7 @@ unsigned long ext4_count_free_inodes (struct super_block * sb) 
			continue;

			continue;





		x = ext4_count_free(bitmap_bh, EXT4_INODES_PER_GROUP(sb) / 8);

		x = ext4_count_free(bitmap_bh, EXT4_INODES_PER_GROUP(sb) / 8);

		printk("group %d: stored = %d, counted = %lu\n",

		printk(KERN_DEBUG "group %lu: stored = %d, counted = %lu\n",

			i, le16_to_cpu(gdp->bg_free_inodes_count), x);

			i, le16_to_cpu(gdp->bg_free_inodes_count), x);

		bitmap_count += x;

		bitmap_count += x;

	}

	}

fs/ext4/resize.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
	}

	}





	if (ext4_bg_has_super(sb, input->group)) {

	if (ext4_bg_has_super(sb, input->group)) {

		ext4_debug("mark backup superblock %#04lx (+0)\n", start);

		ext4_debug("mark backup superblock %#04llx (+0)\n", start);

		ext4_set_bit(0, bh->b_data);

		ext4_set_bit(0, bh->b_data);

	}

	}
@@ -215,7 +215,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
	     i < gdblocks; i++, block++, bit++) {

	     i < gdblocks; i++, block++, bit++) {

		struct buffer_head *gdb;

		struct buffer_head *gdb;





		ext4_debug("update backup group %#04lx (+%d)\n", block, bit);

		ext4_debug("update backup group %#04llx (+%d)\n", block, bit);





		if ((err = extend_or_restart_transaction(handle, 1, bh)))

		if ((err = extend_or_restart_transaction(handle, 1, bh)))

			goto exit_bh;

			goto exit_bh;
@@ -243,7 +243,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
	     i < reserved_gdb; i++, block++, bit++) {

	     i < reserved_gdb; i++, block++, bit++) {

		struct buffer_head *gdb;

		struct buffer_head *gdb;





		ext4_debug("clear reserved block %#04lx (+%d)\n", block, bit);

		ext4_debug("clear reserved block %#04llx (+%d)\n", block, bit);





		if ((err = extend_or_restart_transaction(handle, 1, bh)))

		if ((err = extend_or_restart_transaction(handle, 1, bh)))

			goto exit_bh;

			goto exit_bh;
@@ -256,10 +256,10 @@ static int setup_new_group_blocks(struct super_block *sb, 
		ext4_set_bit(bit, bh->b_data);

		ext4_set_bit(bit, bh->b_data);

		brelse(gdb);

		brelse(gdb);

	}

	}

	ext4_debug("mark block bitmap %#04x (+%ld)\n", input->block_bitmap,

	ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap,

		   input->block_bitmap - start);

		   input->block_bitmap - start);

	ext4_set_bit(input->block_bitmap - start, bh->b_data);

	ext4_set_bit(input->block_bitmap - start, bh->b_data);

	ext4_debug("mark inode bitmap %#04x (+%ld)\n", input->inode_bitmap,

	ext4_debug("mark inode bitmap %#04llx (+%llu)\n", input->inode_bitmap,

		   input->inode_bitmap - start);

		   input->inode_bitmap - start);

	ext4_set_bit(input->inode_bitmap - start, bh->b_data);

	ext4_set_bit(input->inode_bitmap - start, bh->b_data);
@@ -268,7 +268,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
	     i < sbi->s_itb_per_group; i++, bit++, block++) {

	     i < sbi->s_itb_per_group; i++, bit++, block++) {

		struct buffer_head *it;

		struct buffer_head *it;





		ext4_debug("clear inode block %#04lx (+%d)\n", block, bit);

		ext4_debug("clear inode block %#04llx (+%d)\n", block, bit);





		if ((err = extend_or_restart_transaction(handle, 1, bh)))

		if ((err = extend_or_restart_transaction(handle, 1, bh)))

			goto exit_bh;

			goto exit_bh;
@@ -291,7 +291,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
	brelse(bh);

	brelse(bh);





	/* Mark unused entries in inode bitmap used */

	/* Mark unused entries in inode bitmap used */

	ext4_debug("clear inode bitmap %#04x (+%ld)\n",

	ext4_debug("clear inode bitmap %#04llx (+%llu)\n",

		   input->inode_bitmap, input->inode_bitmap - start);

		   input->inode_bitmap, input->inode_bitmap - start);

	if (IS_ERR(bh = bclean(handle, sb, input->inode_bitmap))) {

	if (IS_ERR(bh = bclean(handle, sb, input->inode_bitmap))) {

		err = PTR_ERR(bh);

		err = PTR_ERR(bh);
@@ -1054,7 +1054,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, 
	ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);

	ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);

	sb->s_dirt = 1;

	sb->s_dirt = 1;

	unlock_super(sb);

	unlock_super(sb);

	ext4_debug("freeing blocks %lu through %llu\n", o_blocks_count,

	ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count,

		   o_blocks_count + add);

		   o_blocks_count + add);

	ext4_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);

	ext4_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);

	ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,

	ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,