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>
49 lines
1.2 KiB
C
49 lines
1.2 KiB
C
/*
|
|
* fs/partitions/ultrix.c
|
|
*
|
|
* Code extracted from drivers/block/genhd.c
|
|
*
|
|
* Re-organised Jul 1999 Russell King
|
|
*/
|
|
|
|
#include "check.h"
|
|
#include "ultrix.h"
|
|
|
|
int ultrix_partition(struct parsed_partitions *state)
|
|
{
|
|
int i;
|
|
Sector sect;
|
|
unsigned char *data;
|
|
struct ultrix_disklabel {
|
|
s32 pt_magic; /* magic no. indicating part. info exits */
|
|
s32 pt_valid; /* set by driver if pt is current */
|
|
struct pt_info {
|
|
s32 pi_nblocks; /* no. of sectors */
|
|
u32 pi_blkoff; /* block offset for start */
|
|
} pt_part[8];
|
|
} *label;
|
|
|
|
#define PT_MAGIC 0x032957 /* Partition magic number */
|
|
#define PT_VALID 1 /* Indicates if struct is valid */
|
|
|
|
data = read_part_sector(state, (16384 - sizeof(*label))/512, §);
|
|
if (!data)
|
|
return -1;
|
|
|
|
label = (struct ultrix_disklabel *)(data + 512 - sizeof(*label));
|
|
|
|
if (label->pt_magic == PT_MAGIC && label->pt_valid == PT_VALID) {
|
|
for (i=0; i<8; i++)
|
|
if (label->pt_part[i].pi_nblocks)
|
|
put_partition(state, i+1,
|
|
label->pt_part[i].pi_blkoff,
|
|
label->pt_part[i].pi_nblocks);
|
|
put_dev_sector(sect);
|
|
strlcat(state->pp_buf, "\n", PAGE_SIZE);
|
|
return 1;
|
|
} else {
|
|
put_dev_sector(sect);
|
|
return 0;
|
|
}
|
|
}
|