summaryrefslogtreecommitdiffstats
path: root/fs/jfs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 12:12:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 12:12:30 -0700
commit5153f7e6dba37390902c8fd3edc9a8cc19358ece (patch)
tree1f47f0e30fd93a7d867382bc478d501436371e1a /fs/jfs/inode.c
parentca27ea487ea10bd22459dbc367cf263f1e8d5228 (diff)
parent2d610b80e954045ccfc27558f84e482709e5e5b7 (diff)
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'fs/jfs/inode.c')
-rw-r--r--fs/jfs/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 2137138c59b..767c7ecb429 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -128,6 +128,10 @@ void jfs_delete_inode(struct inode *inode)
{
jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
+ if (is_bad_inode(inode) ||
+ (JFS_IP(inode)->fileset != cpu_to_le32(FILESYSTEM_I)))
+ return;
+
if (test_cflag(COMMIT_Freewmap, inode))
jfs_free_zero_link(inode);