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>
		
			
				
	
	
		
			95 lines
		
	
	
	
		
			1.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			95 lines
		
	
	
	
		
			1.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  fs/partitions/sysv68.c
 | 
						|
 *
 | 
						|
 *  Copyright (C) 2007 Philippe De Muyter <phdm@macqel.be>
 | 
						|
 */
 | 
						|
 | 
						|
#include "check.h"
 | 
						|
#include "sysv68.h"
 | 
						|
 | 
						|
/*
 | 
						|
 *	Volume ID structure: on first 256-bytes sector of disk
 | 
						|
 */
 | 
						|
 | 
						|
struct volumeid {
 | 
						|
	u8	vid_unused[248];
 | 
						|
	u8	vid_mac[8];	/* ASCII string "MOTOROLA" */
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 *	config block: second 256-bytes sector on disk
 | 
						|
 */
 | 
						|
 | 
						|
struct dkconfig {
 | 
						|
	u8	ios_unused0[128];
 | 
						|
	__be32	ios_slcblk;	/* Slice table block number */
 | 
						|
	__be16	ios_slccnt;	/* Number of entries in slice table */
 | 
						|
	u8	ios_unused1[122];
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 *	combined volumeid and dkconfig block
 | 
						|
 */
 | 
						|
 | 
						|
struct dkblk0 {
 | 
						|
	struct volumeid dk_vid;
 | 
						|
	struct dkconfig dk_ios;
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 *	Slice Table Structure
 | 
						|
 */
 | 
						|
 | 
						|
struct slice {
 | 
						|
	__be32	nblocks;		/* slice size (in blocks) */
 | 
						|
	__be32	blkoff;			/* block offset of slice */
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
int sysv68_partition(struct parsed_partitions *state)
 | 
						|
{
 | 
						|
	int i, slices;
 | 
						|
	int slot = 1;
 | 
						|
	Sector sect;
 | 
						|
	unsigned char *data;
 | 
						|
	struct dkblk0 *b;
 | 
						|
	struct slice *slice;
 | 
						|
	char tmp[64];
 | 
						|
 | 
						|
	data = read_part_sector(state, 0, §);
 | 
						|
	if (!data)
 | 
						|
		return -1;
 | 
						|
 | 
						|
	b = (struct dkblk0 *)data;
 | 
						|
	if (memcmp(b->dk_vid.vid_mac, "MOTOROLA", sizeof(b->dk_vid.vid_mac))) {
 | 
						|
		put_dev_sector(sect);
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
	slices = be16_to_cpu(b->dk_ios.ios_slccnt);
 | 
						|
	i = be32_to_cpu(b->dk_ios.ios_slcblk);
 | 
						|
	put_dev_sector(sect);
 | 
						|
 | 
						|
	data = read_part_sector(state, i, §);
 | 
						|
	if (!data)
 | 
						|
		return -1;
 | 
						|
 | 
						|
	slices -= 1; /* last slice is the whole disk */
 | 
						|
	snprintf(tmp, sizeof(tmp), "sysV68: %s(s%u)", state->name, slices);
 | 
						|
	strlcat(state->pp_buf, tmp, PAGE_SIZE);
 | 
						|
	slice = (struct slice *)data;
 | 
						|
	for (i = 0; i < slices; i++, slice++) {
 | 
						|
		if (slot == state->limit)
 | 
						|
			break;
 | 
						|
		if (be32_to_cpu(slice->nblocks)) {
 | 
						|
			put_partition(state, slot,
 | 
						|
				be32_to_cpu(slice->blkoff),
 | 
						|
				be32_to_cpu(slice->nblocks));
 | 
						|
			snprintf(tmp, sizeof(tmp), "(s%u)", i);
 | 
						|
			strlcat(state->pp_buf, tmp, PAGE_SIZE);
 | 
						|
		}
 | 
						|
		slot++;
 | 
						|
	}
 | 
						|
	strlcat(state->pp_buf, "\n", PAGE_SIZE);
 | 
						|
	put_dev_sector(sect);
 | 
						|
	return 1;
 | 
						|
}
 |