diff options
author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /fs/jfs/inode.c | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
download | kernel_samsung_smdk4412-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.gz kernel_samsung_smdk4412-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.bz2 kernel_samsung_smdk4412-84ffa747520edd4556b136bdfc9df9eb1673ce12.zip |
Merge from-linus to-akpm
Diffstat (limited to 'fs/jfs/inode.c')
-rw-r--r-- | fs/jfs/inode.c | 4 |
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); |