Re: Linux 2.4.21pre3-ac2

[Arjan van de Ven]

On Thu, Jan 09, 2003 at 01:14:32PM +0100, Adrian Bunk wrote:
> On Wed, Jan 08, 2003 at 08:39:09PM -0500, Alan Cox wrote:
> >...
> > Linux 2.4.21pre3-ac1
> >...
> > +	IDE Raid support for AMI/SI 'Medley' IDE Raid	(Arjan van de Ven)
> >...
> 
> This causes a compile error if both pdcraid.o and silraid.o are compiled 
> statically into the kernel:

this ought to fix it:
Alan please apply

diff -urN linux-2.4.20/drivers/ide/raid.org/pdcraid.c linux-2.4.20/drivers/ide/raid/pdcraid.c
--- linux-2.4.20/drivers/ide/raid.org/pdcraid.c	2003-01-09 11:03:11.000000000 +0100
+++ linux-2.4.20/drivers/ide/raid/pdcraid.c	2003-01-09 14:09:21.000000000 +0100
@@ -159,48 +159,11 @@
 }
 
 
-unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
+static unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
 {
 	return block + partition_off;
 }
 
-unsigned long partition_map_linux(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
-{
-	unsigned long newblock;
-	
-	newblock = stride - (partition_off%stride); if (newblock == stride) newblock = 0;
-	newblock += block;
-	newblock = newblock % partition_size;
-	newblock += partition_off;
-	
-	return newblock;
-}
-
-static int funky_remap[8] = { 0, 1,  2, 3, 4, 5, 6, 7 };
-
-unsigned long partition_map_linux_raid0_4disk(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
-{
-	unsigned long newblock,temp,temp2;
-	
-	newblock = stride - (partition_off%stride); if (newblock == stride) newblock = 0;
-
-	if (block < (partition_size / (8*stride))*8*stride ) {
-		temp = block % stride;
-		temp2 = block / stride;
-		temp2 = ((temp2>>3)<<3)|(funky_remap[temp2&7]);
-		block = temp2*stride+temp;
-	}
-
-	
-	newblock += block;
-	newblock = newblock % partition_size;
-	newblock += partition_off;
-	
-	return newblock;
-}
-
-
-
 static int pdcraid0_make_request (request_queue_t *q, int rw, struct buffer_head * bh)
 {
 	unsigned long rsect;
diff -urN linux-2.4.20/drivers/ide/raid.org/silraid.c linux-2.4.20/drivers/ide/raid/silraid.c
--- linux-2.4.20/drivers/ide/raid.org/silraid.c	2003-01-09 11:03:31.000000000 +0100
+++ linux-2.4.20/drivers/ide/raid/silraid.c	2003-01-09 14:09:27.000000000 +0100
@@ -157,7 +157,7 @@
 }
 
 
-unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
+static unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
 {
 	return block + partition_off;
 }