mtd/fs/jffs2 nodemgmt.c,1.119,1.120 erase.c,1.73,1.74

[Artem Bityuckiy]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv26445

Modified Files:
	nodemgmt.c erase.c 
Log Message:
Forbid to free inode_cache objects if its nlink isn't zero.


Index: nodemgmt.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodemgmt.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- nodemgmt.c	28 Feb 2005 08:21:05 -0000	1.119
+++ nodemgmt.c	20 Mar 2005 17:46:20 -0000	1.120
@@ -594,7 +594,7 @@
 		*p = ref->next_in_ino;
 		ref->next_in_ino = NULL;
 
-		if (ic->nodes == (void *)ic)
+		if (ic->nodes == (void *)ic && ic->nlink == 0)
 			jffs2_del_ino_cache(c, ic);
 
 		spin_unlock(&c->erase_completion_lock);

Index: erase.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/erase.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- erase.c	17 Mar 2005 20:23:06 -0000	1.73
+++ erase.c	20 Mar 2005 17:46:20 -0000	1.74
@@ -278,7 +278,7 @@
 		printk("\n");
 	});
 
-	if (ic->nodes == (void *)ic)
+	if (ic->nodes == (void *)ic && ic->nlink == 0)
 		jffs2_del_ino_cache(c, ic);
 }