1 files changed, 3 insertions, 1 deletions

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 335faee0c0f5..b580714f0d85 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -782,9 +782,11 @@ static int ext4_mb_init_cache(struct page *page, char *incore)
                 if (bh[i] == NULL)
                         goto out;
 
-                if (bh_uptodate_or_lock(bh[i]))
+                if (buffer_uptodate(bh[i]) &&
+                    !(desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)))
                         continue;
 
+                lock_buffer(bh[i]);
                 spin_lock(sb_bgl_lock(EXT4_SB(sb), first_group + i));
                 if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
                         ext4_init_block_bitmap(sb, bh[i],