9c867fbe06
Fix this garbage happening quite often: ==> sda: scsi 3:0:0:0: CD-ROM TOSHIBA ==> sda1 sda2 sda3 sda4 <sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray ^^^ Uniform CD-ROM driver Revision: 3.20 sr 3:0:0:0: Attached scsi CD-ROM sr0 ==> sda5 sda6 sda7 > Make "sda: sda1 ..." lines actually lines. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
46 lines
970 B
C
46 lines
970 B
C
#include <linux/pagemap.h>
|
|
#include <linux/blkdev.h>
|
|
|
|
/*
|
|
* add_gd_partition adds a partitions details to the devices partition
|
|
* description.
|
|
*/
|
|
struct parsed_partitions {
|
|
struct block_device *bdev;
|
|
char name[BDEVNAME_SIZE];
|
|
struct {
|
|
sector_t from;
|
|
sector_t size;
|
|
int flags;
|
|
} parts[DISK_MAX_PARTS];
|
|
int next;
|
|
int limit;
|
|
bool access_beyond_eod;
|
|
char *pp_buf;
|
|
};
|
|
|
|
static inline void *read_part_sector(struct parsed_partitions *state,
|
|
sector_t n, Sector *p)
|
|
{
|
|
if (n >= get_capacity(state->bdev->bd_disk)) {
|
|
state->access_beyond_eod = true;
|
|
return NULL;
|
|
}
|
|
return read_dev_sector(state->bdev, n, p);
|
|
}
|
|
|
|
static inline void
|
|
put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)
|
|
{
|
|
if (n < p->limit) {
|
|
char tmp[1 + BDEVNAME_SIZE + 10 + 1];
|
|
|
|
p->parts[n].from = from;
|
|
p->parts[n].size = size;
|
|
snprintf(tmp, sizeof(tmp), " %s%d", p->name, n);
|
|
strlcat(p->pp_buf, tmp, PAGE_SIZE);
|
|
}
|
|
}
|
|
|
|
extern int warn_no_part;
|
|
|