Commit 47bc91ff authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] remove kdevname abuse from init/do_mount.c

use bdevname() for block devices.
parent 85b49be7
...@@ -297,13 +297,12 @@ static void __init mount_block_root(char *name, int flags) ...@@ -297,13 +297,12 @@ static void __init mount_block_root(char *name, int flags)
* Allow the user to distinguish between failed open * Allow the user to distinguish between failed open
* and bad superblock on root device. * and bad superblock on root device.
*/ */
printk ("VFS: Cannot open root device \"%s\" or %s\n", printk("VFS: Cannot open root device \"%s\" or %s\n",
root_device_name, kdevname (to_kdev_t(ROOT_DEV))); root_device_name, __bdevname(ROOT_DEV));
printk ("Please append a correct \"root=\" boot option\n"); printk("Please append a correct \"root=\" boot option\n");
panic("VFS: Unable to mount root fs on %s", panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV));
kdevname(to_kdev_t(ROOT_DEV)));
} }
panic("VFS: Unable to mount root fs on %s", kdevname(to_kdev_t(ROOT_DEV))); panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV));
out: out:
putname(fs_names); putname(fs_names);
sys_chdir("/root"); sys_chdir("/root");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment