From 86579fbd2a23f05e256a0970aeb7387cdddcb24f Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 10 Oct 2004 11:15:22 +0000 Subject: [PATCH] Make this actually compile. --- sys/dev/raidframe/rf_disks.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index 95078fa977d3..16e0c2710703 100644 --- a/sys/dev/raidframe/rf_disks.c +++ b/sys/dev/raidframe/rf_disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.55 2004/10/10 01:17:40 mrg Exp $ */ +/* $NetBSD: rf_disks.c,v 1.56 2004/10/10 11:15:22 tron Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -67,7 +67,7 @@ ***************************************************************/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.55 2004/10/10 01:17:40 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.56 2004/10/10 11:15:22 tron Exp $"); #include @@ -284,8 +284,10 @@ rf_ConfigureSpareDisks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr, goto fail; } else if (disks[i].numBlocks > raidPtr->sectorsPerDisk) { - RF_ERRORMSG2("Warning: truncating spare disk %s to %ld blocks (from %ld)\n", disks[i].devname, - (long int) raidPtr->sectorsPerDisk, disks[i].numBlocks); + RF_ERRORMSG3("Warning: truncating spare disk %s to %ld blocks (from %ld)\n", + disks[i].devname, + (long int) raidPtr->sectorsPerDisk, + (long int) disks[i].numBlocks); disks[i].numBlocks = raidPtr->sectorsPerDisk; } @@ -1025,8 +1027,10 @@ rf_add_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr) } else { if (disks[spare_number].numBlocks > raidPtr->sectorsPerDisk) { - RF_ERRORMSG2("Warning: truncating spare disk %s to %ld blocks (from %ld)\n", disks[spare_number].devname, - (long int) raidPtr->sectorsPerDisk, disks[spare_number].numBlocks); + RF_ERRORMSG3("Warning: truncating spare disk %s to %ld blocks (from %ld)\n", + disks[spare_number].devname, + (long int) raidPtr->sectorsPerDisk, + (long int) disks[spare_number].numBlocks); disks[spare_number].numBlocks = raidPtr->sectorsPerDisk; }