diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-09-13 04:16:09 -0400 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-09-16 18:01:58 -0700 |
| commit | 81ddd439761f2f2e6837f9746c83864f410a4077 (patch) | |
| tree | 317d7c5a36e348e8d401a2f2777112b76d8e1088 | |
| parent | 504b891bc7cc7fb76e3000b5fe91ca491eb773c5 (diff) | |
[PATCH] jfs: jfs_delete_inode must call clear_inode
JFS: jfs_delete_inode should always call clear_inode.
> From Chuck Ebbert:
I'm submitting this patch for -stable:
- it reportedly fixes an oops
- it's already in 2.6.13-git
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
| -rw-r--r-- | fs/jfs/inode.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 767c7ecb429e..37da3e33e750 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -128,21 +128,21 @@ 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 (!is_bad_inode(inode) && + (JFS_IP(inode)->fileset == cpu_to_le32(FILESYSTEM_I))) { - if (test_cflag(COMMIT_Freewmap, inode)) - jfs_free_zero_link(inode); + if (test_cflag(COMMIT_Freewmap, inode)) + jfs_free_zero_link(inode); - diFree(inode); + diFree(inode); - /* - * Free the inode from the quota allocation. - */ - DQUOT_INIT(inode); - DQUOT_FREE_INODE(inode); - DQUOT_DROP(inode); + /* + * Free the inode from the quota allocation. + */ + DQUOT_INIT(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + } clear_inode(inode); } |