initrd: remove the BLKFLSBUF call in handle_initrd (899ac10c) · Commits · 戴 / test

BLKFLSBUF used to be overloaded for the ramdisk driver to free the whole ramdisk, which was completely different behavior compared to all other drivers. But this magic overload got removed in commit ("brd: remove support for BLKFLSBUF"), so this call is entirely pointless now. Signed-off-by:

Christoph Hellwig <hch@lst.de> Acked-by:

Linus Torvalds <torvalds@linux-foundation.org>

init/do_mounts_initrd.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -115,21 +115,12 @@ static void __init handle_initrd(void)
		if (!error)
		printk("okay\n");
		else {
		int fd = ksys_open("/dev/root.old", O_RDWR, 0);
		if (error == -ENOENT)
		printk("/initrd does not exist. Ignored.\n");
		else
		printk("failed\n");
		printk(KERN_NOTICE "Unmounting old root\n");
		ksys_umount("/old", MNT_DETACH);
		printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
		if (fd < 0) {
		error = fd;
		} else {
		error = ksys_ioctl(fd, BLKFLSBUF, 0);
		ksys_close(fd);
		}
		printk(!error ? "okay\n" : "failed\n");
		}
		}

Admin message