@@ -2189,14 +2189,11 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode,
start = ext_pblock(ex) + ee_len - num;
ext_debug("free last %u blocks starting %llu\n", num, start);
ext4_free_blocks(handle, inode, 0, start, num, flags);
- } else if (from == le32_to_cpu(ex->ee_block)
- && to <= le32_to_cpu(ex->ee_block) + ee_len - 1) {
- printk(KERN_INFO "strange request: removal %u-%u from %u:%u\n",
- from, to, le32_to_cpu(ex->ee_block), ee_len);
- } else {
- printk(KERN_INFO "strange request: removal(2) "
- "%u-%u from %u:%u\n",
- from, to, le32_to_cpu(ex->ee_block), ee_len);
+ } else {
+ EXT4_ERROR_INODE(inode, "strange request: removal %u-%u from"
+ " %u:%u\n", from, to,
+ le32_to_cpu(ex->ee_block), ee_len);
+ return -EIO;
}
return 0;
}
@@ -770,7 +770,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
static void ext4_destroy_inode(struct inode *inode)
{
- if (!list_empty(&(EXT4_I(inode)->i_orphan))) {
+ if (unlikely(!list_empty(&(EXT4_I(inode)->i_orphan)))) {
ext4_msg(inode->i_sb, KERN_ERR,
"Inode %lu (%p): orphan list check failed!",
inode->i_ino, EXT4_I(inode));
@@ -779,6 +779,18 @@ static void ext4_destroy_inode(struct inode *inode)
true);
dump_stack();
}
+ if (unlikely(EXT4_I(inode)->i_reserved_data_blocks) ||
+ EXT4_I(inode)->i_reserved_meta_blocks ||
+ EXT4_I(inode)->i_allocated_meta_blocks) {
+ ext4_msg(inode->i_sb, KERN_ERR, "Inode %lu (%p): Destroyed"
+ " inode still has reserved blocks and probably would"
+ " leak, rsv_data=%u, rsv_mdata=%u, alloc_mblk=%u",
+ inode->i_ino, EXT4_I(inode),
+ EXT4_I(inode)->i_reserved_data_blocks,
+ EXT4_I(inode)->i_reserved_meta_blocks,
+ EXT4_I(inode)->i_allocated_meta_blocks);
+ dump_stack();
+ }
kmem_cache_free(ext4_inode_cachep, EXT4_I(inode));
}
- It is reasonable to return EIO from ext4_remove_blocks() if extent is incorrect. - Check that reservation counters are consistent at the on inode drop. Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ext4/extents.c | 13 +++++-------- fs/ext4/super.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 9 deletions(-)