From d64a7f44ceaca4836b0fa7e8141f894217d17957 Mon Sep 17 00:00:00 2001 From: oster Date: Fri, 2 Aug 2002 04:01:51 +0000 Subject: [PATCH] - AuxFunc is no longer used. - cleanup function prototypes in rf_diskqueue.h --- sys/dev/raidframe/rf_diskqueue.c | 5 ++--- sys/dev/raidframe/rf_diskqueue.h | 17 +---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index 1569f84c1a3d..4de657039572 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.c,v 1.16 2002/08/02 03:55:13 oster Exp $ */ +/* $NetBSD: rf_diskqueue.c,v 1.17 2002/08/02 04:01:51 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -66,7 +66,7 @@ ****************************************************************************/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.16 2002/08/02 03:55:13 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.17 2002/08/02 04:01:51 oster Exp $"); #include @@ -532,7 +532,6 @@ rf_CreateDiskQueueData( p->next = next; p->tracerec = tracerec; p->priority = RF_IO_NORMAL_PRIORITY; - p->AuxFunc = NULL; p->buf2 = NULL; p->raidPtr = raidPtr; p->flags = flags; diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index 3ff7f30a62b9..096d61ef98d2 100644 --- a/sys/dev/raidframe/rf_diskqueue.h +++ b/sys/dev/raidframe/rf_diskqueue.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.h,v 1.6 2001/10/04 15:58:53 oster Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.7 2002/08/02 04:01:51 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -64,9 +64,6 @@ struct RF_DiskQueueData_s { int priority; /* the priority of this request */ int (*CompleteFunc) (void *, int); /* function to be called upon * completion */ - int (*AuxFunc) (void *,...); /* function called upon - * completion of the first I/O - * of a Read_Op_Write pair */ void *argument; /* argument to be passed to CompleteFunc */ RF_Raid_t *raidPtr; /* needed for simulation */ RF_AccTraceEntry_t *tracerec; /* perf mon only */ @@ -184,18 +181,6 @@ rf_CreateDiskQueueData(RF_IoType_t typ, RF_SectorNum_t ssect, void *raidPtr, RF_DiskQueueDataFlags_t flags, void *kb_proc); -RF_DiskQueueData_t * -rf_CreateDiskQueueDataFull(RF_IoType_t typ, RF_SectorNum_t ssect, - RF_SectorCount_t nsect, caddr_t buf, - RF_StripeNum_t parityStripeID, - RF_ReconUnitNum_t which_ru, - int (*wakeF) (void *, int), - void *arg, RF_DiskQueueData_t * next, - RF_AccTraceEntry_t * tracerec, - int priority, int (*AuxFunc) (void *,...), - caddr_t buf2, void *raidPtr, - RF_DiskQueueDataFlags_t flags, void *kb_proc); - void rf_FreeDiskQueueData(RF_DiskQueueData_t * p);