[PATCH] Fix cockups (wot I made) in fs/partitions/acorn.c

[Russell King]

It seems that my test config didn't actually have this enabled (it does
now.)  I'll push it Linus-wards tomorrow unless someone screams.

diff -urN orig/fs/partitions/acorn.c linux/fs/partitions/acorn.c
--- orig/fs/partitions/acorn.c	Mon Jun 23 11:51:28 2003
+++ linux/fs/partitions/acorn.c	Mon Jun 23 12:28:58 2003
@@ -517,7 +517,7 @@
 	const unsigned char *data;
 	unsigned char buffer[256];
 	struct eesox_part *p;
-	u32 start = 0;
+	sector_t start = 0;
 	int i, slot = 1;
 
 	data = read_dev_sector(bdev, 7, &sect);
@@ -533,22 +533,22 @@
 	put_dev_sector(sect);
 
 	for (i = 0, p = (struct eesox_part *)buffer; i < 8; i++, p++) {
-		u32 next;
+		sector_t next;
 
 		if (memcmp(p->magic, "Eesox", 6))
 			break;
 
-		next = le32_to_cpu(p->start) + first_sector;
+		next = le32_to_cpu(p->start);
 		if (i)
 			put_partition(state, slot++, start, next - start);
 		start = next;
 	}
 
 	if (i != 0) {
-		unsigned long size;
+		sector_t size;
 
-		size = hd->part[minor(to_kdev_t(bdev->bd_dev))].nr_sects;
-		add_gd_partition(hd, minor++, start, size - start);
+		size = get_capacity(bdev->bd_disk);
+		put_partition(state, slot++, start, size - start);
 		printk("\n");
 	}
 

-- 
Russell King ([e-mail])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html