From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 14 Nov 2006 18:21:56 +0000 (+0000)
Subject: converge to mainline version of handling broken hardlinks
X-Git-Tag: before-vs2_0_2_2-rc6-schedfix-merge~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bd287089f8a8a371d5b1e648782360107bd5812c;p=linux-2.6.git

converge to mainline version of handling broken hardlinks
---

diff --git a/init/initramfs.c b/init/initramfs.c
index 738cc062f..d28c1094d 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -286,7 +286,6 @@ static int __init do_name(void)
 		sys_chmod(collected, mode);
 	} else if (S_ISBLK(mode) || S_ISCHR(mode) ||
 		   S_ISFIFO(mode) || S_ISSOCK(mode)) {
-		sys_unlink(collected);
 		if (maybe_link() == 0) {
 			sys_mknod(collected, mode, rdev);
 			sys_chown(collected, uid, gid);