[PATCH] sgi partitionning fix (Was: 2.6.0-test1 on alpha : disk label numbering trouble)

["Ghozlane Toumi" <gtoumi@laposte.net>]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

> quickly checking viro's changes in this area, it seems other partitions
> schemes are touched by the same problem...

I stand corrected. after looking a little bit deeper, the sun partition
has been corrected, the other are not touched.
However, I found out that sgi partitionning had this "renumbering"
issue even before viro's patch.
I don't know if this is correct, in any case this is an untested patch
that changes this behaviour for sgi partitions.
patch is attached because of dumb mailer.

thanks, 
ghoz




[-- Attachment #2: partition.diff --]
[-- Type: application/octet-stream, Size: 819 bytes --]

diff -Nr -U4 -X dontdiff linux-2.6.0-test1.orig/fs/partitions/sgi.c linux-2.6.0-test1/fs/partitions/sgi.c
--- linux-2.6.0-test1.orig/fs/partitions/sgi.c	Mon Jul 14 05:31:22 2003
+++ linux-2.6.0-test1/fs/partitions/sgi.c	Mon Jul 28 23:58:23 2003
@@ -29,9 +29,8 @@
 
 int sgi_partition(struct parsed_partitions *state, struct block_device *bdev)
 {
 	int i, csum, magic;
-	int slot = 1;
 	unsigned int *ui, start, blocks, cs;
 	Sector sect;
 	struct sgi_disklabel *label;
 	struct sgi_partition *p;
@@ -67,9 +66,9 @@
 	for(i = 0; i < 16; i++, p++) {
 		blocks = be32_to_cpu(p->num_blocks);
 		start  = be32_to_cpu(p->first_block);
 		if (blocks)
-			put_partition(state, slot++, start, blocks);
+			put_partition(state, i+1, start, blocks);
 	}
 	printk("\n");
 	put_dev_sector(sect);
 	return 1;