From: Dmitry Monakhov <dmonakhov@openvz.org>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, Dmitry Monakhov <dmonakhov@openvz.org>
Subject: [PATCH] ext4: Add more sanity checks
Date: Thu, 27 May 2010 15:17:41 +0400 [thread overview]
Message-ID: <1274959061-8043-1-git-send-email-dmonakhov@openvz.org> (raw)
- 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(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e3cc230..c39cb39 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -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;
}
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 49d88c0..e5166e5 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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));
}
--
1.6.6.1
next reply other threads:[~2010-05-27 11:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 11:17 Dmitry Monakhov [this message]
2010-06-03 10:17 ` [PATCH] ext4: Add more sanity checks V2 Dmitry Monakhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274959061-8043-1-git-send-email-dmonakhov@openvz.org \
--to=dmonakhov@openvz.org \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).