From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 29 Jun 2007 00:22:03 +0000 (+0000)
Subject: Mainline kernel already includes Mark Huang's fix.  No need for the
X-Git-Tag: linux-2.6-22-1~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e78f7b9e2180d8d7d45cd8b6c62570690f6ba448;p=linux-2.6.git

Mainline kernel already includes Mark Huang's fix.  No need for the
sys_unlink(collected) call, as the previous call to clean_path(collected,mode)
takes care of doing this.
---

diff --git a/init/initramfs.c b/init/initramfs.c
index e626a7584..4fa0f7977 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -290,7 +290,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);