patch-2.1.53 linux/fs/dcache.c

• Lines: 26
• Date: Thu Sep 4 11:23:53 1997
• Orig file: v2.1.52/linux/fs/dcache.c
• Orig date: Wed Sep 3 20:52:43 1997

diff -u --recursive --new-file v2.1.52/linux/fs/dcache.c linux/fs/dcache.c
@@ -365,21 +365,19 @@
 	if (!dentry->d_inode)
 		printk("VFS: moving negative dcache entry\n");
 
-	/* Switch the hashes.. */
-	oldhead = dentry->d_hash.prev;
+	/* Move the dentry to the target hash queue */
 	list_del(&dentry->d_hash);
 	list_add(&dentry->d_hash, &target->d_hash);
+
+	/* Unhash the target: dput() will then get rid of it */
 	list_del(&target->d_hash);
-	list_add(&target->d_hash, oldhead);
+	INIT_LIST_HEAD(&target->d_hash);
 
 	/* Switch the parents and the names.. */
 	switch(dentry->d_parent, target->d_parent);
 	switch(dentry->d_name.name, target->d_name.name);
 	switch(dentry->d_name.len, target->d_name.len);
 	switch(dentry->d_name.hash, target->d_name.hash);
-
-	/* Mark the (now overwritten) target deleted. */
-	d_delete(target);
 }
 
 /*