diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-06-07 17:40:30 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-07-30 08:22:47 +0200 |
| commit | 899ac10cc0bdaaee3b908e390bf94d2f1ba5d512 (patch) | |
| tree | 744d3462337069695141aaa37bbca418473dd370 | |
| parent | initrd: remove support for multiple floppies (diff) | |
| download | linux-899ac10cc0bdaaee3b908e390bf94d2f1ba5d512.tar.xz linux-899ac10cc0bdaaee3b908e390bf94d2f1ba5d512.zip | |
initrd: remove the BLKFLSBUF call in handle_initrd
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 ff26956875c2
("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>
| -rw-r--r-- | init/do_mounts_initrd.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index d72beda824aa..e4f88e9e1c08 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -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"); } } |