From: Andrew Morton Cc: Dave Gilbert Cc: Jan Engelhardt Signed-off-by: Andrew Morton --- block/genhd.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff -puN block/genhd.c~display-all-possible-partitions-when-the-root-filesystem-failed-to-mount-fix block/genhd.c --- a/block/genhd.c~display-all-possible-partitions-when-the-root-filesystem-failed-to-mount-fix +++ a/block/genhd.c @@ -216,16 +216,16 @@ struct gendisk *get_gendisk(dev_t dev, i } /* - * printk a full list of all partitions - intended for - * places where the root filesystem can't be mounted and thus - * to give the victim some idea of what went wrong + * print a full list of all partitions - intended for places where the root + * filesystem can't be mounted and thus to give the victim some idea of what + * went wrong */ void __init printk_all_partitions(void) { int n; struct gendisk *sgp; - mutex_lock(&block_subsys_lock); + mutex_lock(&block_subsys_lock); /* For each block device... */ list_for_each_entry(sgp, &block_subsys.kset.list, kobj.entry) { char buf[BDEVNAME_SIZE]; @@ -233,7 +233,7 @@ void __init printk_all_partitions(void) * Don't show empty devices or things that have been surpressed */ if (get_capacity(sgp) == 0 || - (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) + (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) continue; /* @@ -241,13 +241,13 @@ void __init printk_all_partitions(void) * hex - the same format as the root= option takes. */ printk("%02x%02x %10llu %s", - sgp->major, sgp->first_minor, - (unsigned long long)get_capacity(sgp) >> 1, - disk_name(sgp, 0, buf)); + sgp->major, sgp->first_minor, + (unsigned long long)get_capacity(sgp) >> 1, + disk_name(sgp, 0, buf)); if (sgp->driverfs_dev != NULL && - sgp->driverfs_dev->driver != NULL) + sgp->driverfs_dev->driver != NULL) printk(" driver: %s\n", - sgp->driverfs_dev->driver->name); + sgp->driverfs_dev->driver->name); else printk(" (driver?)\n"); @@ -258,9 +258,9 @@ void __init printk_all_partitions(void) if (sgp->part[n]->nr_sects == 0) continue; printk(" %02x%02x %10llu %s\n", - sgp->major, n + 1 + sgp->first_minor, - (unsigned long long)sgp->part[n]->nr_sects >> 1, - disk_name(sgp, n + 1, buf)); + sgp->major, n + 1 + sgp->first_minor, + (unsigned long long)sgp->part[n]->nr_sects >> 1, + disk_name(sgp, n + 1, buf)); } /* partition subloop */ } /* Block device loop */ _