summaryrefslogtreecommitdiffstats
path: root/drivers/block/raid0.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
commit7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch)
tree5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /drivers/block/raid0.c
parentba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff)
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'drivers/block/raid0.c')
-rw-r--r--drivers/block/raid0.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/raid0.c b/drivers/block/raid0.c
index 0e075277a..83700e235 100644
--- a/drivers/block/raid0.c
+++ b/drivers/block/raid0.c
@@ -41,7 +41,7 @@ static int create_strip_zones (mddev_t *mddev)
printk("raid0: looking at %s\n", partition_name(rdev1->dev));
c = 0;
ITERATE_RDEV_ORDERED(mddev,rdev2,j2) {
- printk("raid0: comparing %s(%d) with %s(%d)\n", partition_name(rdev1->dev), rdev1->size, partition_name(rdev2->dev), rdev2->size);
+ printk("raid0: comparing %s(%ld) with %s(%ld)\n", partition_name(rdev1->dev), rdev1->size, partition_name(rdev2->dev), rdev2->size);
if (rdev2 == rdev1) {
printk("raid0: END\n");
break;
@@ -95,7 +95,7 @@ static int create_strip_zones (mddev_t *mddev)
c++;
if (!smallest || (rdev->size <smallest->size)) {
smallest = rdev;
- printk(" (%d) is smallest!.\n", rdev->size);
+ printk(" (%ld) is smallest!.\n", rdev->size);
}
} else
printk(" nope.\n");
@@ -326,13 +326,11 @@ static int raid0_status (char *page, mddev_t *mddev)
static mdk_personality_t raid0_personality=
{
"raid0",
- NULL, /* no special map */
raid0_make_request,
NULL, /* no special end_request */
raid0_run,
raid0_stop,
raid0_status,
- NULL, /* no ioctls */
0,
NULL, /* no error_handler */
NULL, /* no diskop */