/[linux-patches]/genpatches-2.6/tags/2.6.13-4/1014_2_jfs_delete_inode-must-call-clear_inode.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.13-4/1014_2_jfs_delete_inode-must-call-clear_inode.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 168 - (show annotations) (download)
Sun Sep 18 11:19:29 2005 UTC (9 years ago) by dsd
File size: 1685 byte(s)
2.6.13-4 release
1 From stable-bounces@linux.kernel.org Tue Sep 13 01:19:12 2005
2 Date: Tue, 13 Sep 2005 04:16:09 -0400
3 From: Chuck Ebbert <76306.1226@compuserve.com>
4 To: linux-stable <stable@kernel.org>
5 Cc: Dave Kleikamp <shaggy@austin.ibm.com>
6 Subject: jfs: jfs_delete_inode must call clear_inode
7
8 From: Dave Kleikamp <shaggy@austin.ibm.com>
9
10 JFS: jfs_delete_inode should always call clear_inode.
11
12 > From Chuck Ebbert:
13 I'm submitting this patch for -stable:
14
15 - it reportedly fixes an oops
16 - it's already in 2.6.13-git
17
18 Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
19 Signed-off-by: Chris Wright <chrisw@osdl.org>
20 ---
21 fs/jfs/inode.c | 24 ++++++++++++------------
22 1 files changed, 12 insertions(+), 12 deletions(-)
23
24 Index: linux-2.6.13.y/fs/jfs/inode.c
25 ===================================================================
26 --- linux-2.6.13.y.orig/fs/jfs/inode.c
27 +++ linux-2.6.13.y/fs/jfs/inode.c
28 @@ -128,21 +128,21 @@ void jfs_delete_inode(struct inode *inod
29 {
30 jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
31
32 - if (is_bad_inode(inode) ||
33 - (JFS_IP(inode)->fileset != cpu_to_le32(FILESYSTEM_I)))
34 - return;
35 + if (!is_bad_inode(inode) &&
36 + (JFS_IP(inode)->fileset == cpu_to_le32(FILESYSTEM_I))) {
37
38 - if (test_cflag(COMMIT_Freewmap, inode))
39 - jfs_free_zero_link(inode);
40 + if (test_cflag(COMMIT_Freewmap, inode))
41 + jfs_free_zero_link(inode);
42
43 - diFree(inode);
44 + diFree(inode);
45
46 - /*
47 - * Free the inode from the quota allocation.
48 - */
49 - DQUOT_INIT(inode);
50 - DQUOT_FREE_INODE(inode);
51 - DQUOT_DROP(inode);
52 + /*
53 + * Free the inode from the quota allocation.
54 + */
55 + DQUOT_INIT(inode);
56 + DQUOT_FREE_INODE(inode);
57 + DQUOT_DROP(inode);
58 + }
59
60 clear_inode(inode);
61 }

  ViewVC Help
Powered by ViewVC 1.1.20