initrd: remove the BLKFLSBUF call in handle_initrd
authorChristoph Hellwig <hch@lst.de>
Sun, 7 Jun 2020 15:40:30 +0000 (17:40 +0200)
committerChristoph Hellwig <hch@lst.de>
Thu, 30 Jul 2020 06:22:47 +0000 (08:22 +0200)
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>
init/do_mounts_initrd.c

index d72beda824aa79537b33da889d99063ed27f9ac0..e4f88e9e1c08397e1e7f44b9d25f2b8eae186d2d 100644 (file)
@@ -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");
        }
 }