Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / fs / ext4 / resize.c

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index e7ae26e36c9c119a0b8b025e57914ba411b38ac5..c0e9aef376a73723130c1c56526338150a0cc79b 100644 (file)
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -874,6 +874,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
        err = ext4_handle_dirty_metadata(handle, NULL, gdb_bh);
        if (unlikely(err)) {
                ext4_std_error(sb, err);
+               iloc.bh = NULL;
                goto errout;
        }
        brelse(dind);
@@ -1760,8 +1761,6 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
                ext4_msg(sb, KERN_ERR,
                         "filesystem too large to resize to %llu blocks safely",
                         n_blocks_count);
-               if (sizeof(sector_t) < 8)
-                       ext4_warning(sb, "CONFIG_LBDAF not enabled");
                return -EINVAL;
        }