diff --git a/[refs] b/[refs] index 019d3e2df01c..c8f1470dc2b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 093e6e3666f47d29763a235b404c84ee47ba8bb0 +refs/heads/master: 5b5ffa49d4bbb8ca4c41c094261660264f16bd20 diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c index 61cdb97f338c..607b1557d292 100644 --- a/trunk/fs/ext4/extents.c +++ b/trunk/fs/ext4/extents.c @@ -2955,7 +2955,6 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, /* Pre-conditions */ BUG_ON(!ext4_ext_is_uninitialized(ex)); BUG_ON(!in_range(map->m_lblk, ee_block, ee_len)); - BUG_ON(map->m_lblk + map->m_len > ee_block + ee_len); /* * Attempt to transfer newly initialized blocks from the currently