From: Arjan van de Ven <arjanv@redhat.com>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: Alan Cox <alan@redhat.com>, Arjan van de Ven <arjanv@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: Linux 2.4.21pre3-ac2
Date: Thu, 9 Jan 2003 13:15:10 +0000 [thread overview]
Message-ID: <20030109131510.A25566@devserv.devel.redhat.com> (raw)
In-Reply-To: <20030109121431.GQ6626@fs.tum.de>; from bunk@fs.tum.de on Thu, Jan 09, 2003 at 01:14:32PM +0100
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;
}
next prev parent reply other threads:[~2003-01-09 13:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-09 1:39 Linux 2.4.21pre3-ac2 Alan Cox
2003-01-09 2:02 ` Paulo Andre'
2003-01-09 11:24 ` Linux 2.4.21pre3-ac2 - some trivial patches Eyal Lebedinsky
[not found] ` <1042134064.27796.18.camel@irongate.swansea.linux.org.uk>
2003-01-09 21:10 ` Eyal Lebedinsky
2003-01-09 12:14 ` Linux 2.4.21pre3-ac2 Adrian Bunk
2003-01-09 13:15 ` Arjan van de Ven [this message]
2003-01-09 13:27 ` Adrian Bunk
2003-01-09 23:37 ` Jean-Daniel Pauget
2003-01-10 2:25 ` Alan Cox
2003-01-13 3:33 ` Bill Davidsen
2003-01-13 15:01 ` Alan Cox
2003-01-13 17:22 ` John Stoffel
2003-01-14 11:17 ` Horst von Brand
2003-01-10 9:45 ` Ralf Hildebrandt
2003-01-10 12:00 ` Alan Cox
2003-01-10 11:15 ` Ralf Hildebrandt
2003-01-10 13:30 ` Ralf Hildebrandt
2003-01-10 14:17 ` Ralf Hildebrandt
2003-01-10 15:17 ` Alan Cox
2003-01-10 11:21 ` Ralf Hildebrandt
2003-01-10 14:38 ` Adrian Bunk
[not found] <20030109015006$7068@gated-at.bofh.it>
2003-01-09 5:32 ` Allan Duncan
-- strict thread matches above, loose matches on Subject: below --
2003-01-09 11:42 rwhron
2003-01-09 23:15 Michael Madore
[not found] <20030113034016$67b9@gated-at.bofh.it>
[not found] ` <20030113142009$6327@gated-at.bofh.it>
2003-01-13 14:32 ` Bertrand VIEILLE [Bébert]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030109131510.A25566@devserv.devel.redhat.com \
--to=arjanv@redhat.com \
--cc=alan@redhat.com \
--cc=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox