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 e626a75..4fa0f79 100644 (file)
--- 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);