1 files changed, 3 insertions, 3 deletions

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 3b64bb16c727..e53b4af52f11 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -517,7 +517,7 @@ do_more:
                 /*
                  * An HJ special.  This is expensive...
                  */
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
                 jbd_unlock_bh_state(bitmap_bh);
                 {
                         struct buffer_head *debug_bh;
@@ -1585,7 +1585,7 @@ allocated:
         ret_block = grp_alloc_blk + ext4_group_first_block_no(sb, group_no);
 
         if (in_range(ext4_block_bitmap(sb, gdp), ret_block, num) ||
-            in_range(ext4_block_bitmap(sb, gdp), ret_block, num) ||
+            in_range(ext4_inode_bitmap(sb, gdp), ret_block, num) ||
             in_range(ret_block, ext4_inode_table(sb, gdp),
                      EXT4_SB(sb)->s_itb_per_group) ||
             in_range(ret_block + num - 1, ext4_inode_table(sb, gdp),
@@ -1597,7 +1597,7 @@ allocated:
 
         performed_allocation = 1;
 
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
         {
                 struct buffer_head *debug_bh;