[PATCH] Amiga partition fix

[PATCH] Amiga partition fix

[Thomas Richter]

Hi,

what happened to Joanne Dow's patch to fix the recognition of
Amiga RDSK blocks? In case that got lost, here's the patch again:

/* snip */

--- amiga.c	2004-08-09 08:52:07.268123677 -0700
+++ amiga.c.orig	2004-08-09 08:51:31.527104456 -0700
@@ -31,7 +31,6 @@ amiga_partition(struct parsed_partitions
 	struct RigidDiskBlock *rdb;
 	struct PartitionBlock *pb;
 	int start_sect, nr_sects, blk, part, res = 0;
-	int blksize = 1;	/* Multiplier for disk block size */
 	int slot = 1;
 	char b[BDEVNAME_SIZE];
 
@@ -66,14 +65,10 @@ amiga_partition(struct parsed_partitions
 			       bdevname(bdev, b), blk);
 	}
 
-        /* blksize is blocks per 512 byte standard block */
-        blksize = be32_to_cpu( rdb->rdb_BlockBytes ) / 512;
-
-	printk(" RDSK (%d)", blksize * 512);	/* Be more informative */
+	printk(" RDSK");
 	blk = be32_to_cpu(rdb->rdb_PartitionList);
 	put_dev_sector(sect);
 	for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {
-		blk *= blksize;	/* Read in terms partition table understands */
 		data = read_dev_sector(bdev, blk, &sect);
 		if (!data) {
 			if (warn_no_part)
@@ -93,32 +88,13 @@ amiga_partition(struct parsed_partitions
 		nr_sects = (be32_to_cpu(pb->pb_Environment[10]) + 1 -
 			    be32_to_cpu(pb->pb_Environment[9])) *
 			   be32_to_cpu(pb->pb_Environment[3]) *
-			   be32_to_cpu(pb->pb_Environment[5]) *
-			   blksize;
+			   be32_to_cpu(pb->pb_Environment[5]);
 		if (!nr_sects)
 			continue;
 		start_sect = be32_to_cpu(pb->pb_Environment[9]) *
 			     be32_to_cpu(pb->pb_Environment[3]) *
-			     be32_to_cpu(pb->pb_Environment[5]) *
-			     blksize;
+			     be32_to_cpu(pb->pb_Environment[5]);
 		put_partition(state,slot++,start_sect,nr_sects);
-		{
-			/* Be even more informative to aid mounting */
-			char dostype[ 4 ];
-			u32 *dt = (u32*) dostype;
-			*dt = pb->pb_Environment[ 16 ];
-			if ( dostype[ 3 ] < ' ')
-				printk( " (%c%c%c^%c)",
-					dostype[ 0 ], dostype[ 1 ],
-					dostype[ 2 ], dostype[ 3 ] + '@' );
-			else
-				printk( " (%c%c%c%c)",
-					dostype[ 0 ], dostype[ 1 ],
-					dostype[ 2 ], dostype[ 3 ]);
-			printk( "(res %d spb %d)",
-				be32_to_cpu( pb->pb_Environment[ 6 ]),
-				be32_to_cpu( pb->pb_Environment[ 4 ]));
-		}
 		res = 1;
 	}
 	printk("\n");

/* snip */

So long,
	Thomas

Re: [PATCH] Amiga partition fix

[jdow]

I received an email saying the patch was approved. I'm not sure when
that means it will find its way into the kernel.
{^_^}
----- Original Message ----- 
From: "Thomas Richter" <thor@math.TU-Berlin.DE>


> 
> Hi,
> 
> what happened to Joanne Dow's patch to fix the recognition of
> Amiga RDSK blocks? In case that got lost, here's the patch again:
> 
> /* snip */
> 
> --- amiga.c 2004-08-09 08:52:07.268123677 -0700
> +++ amiga.c.orig 2004-08-09 08:51:31.527104456 -0700
> @@ -31,7 +31,6 @@ amiga_partition(struct parsed_partitions
>   struct RigidDiskBlock *rdb;
>   struct PartitionBlock *pb;
>   int start_sect, nr_sects, blk, part, res = 0;
> - int blksize = 1; /* Multiplier for disk block size */
>   int slot = 1;
>   char b[BDEVNAME_SIZE];

Re: [PATCH] Amiga partition fix

[Geert Uytterhoeven]

On Tue, 7 Sep 2004, jdow wrote:
> I received an email saying the patch was approved. I'm not sure when
> that means it will find its way into the kernel.

It's in Linus' tree since August 31:

    http://linux.bkbits.net:8080/linux-2.6/user=jdow/ChangeSet@-2w?nav=!-|index.html|stats|!+|index.html

> From: "Thomas Richter" <thor@math.TU-Berlin.DE>
> > what happened to Joanne Dow's patch to fix the recognition of
> > Amiga RDSK blocks? In case that got lost, here's the patch again:

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds