Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cleanup unneeded 'row' from RF_CallbackDesc_s. 

- remove callbackArg2 from RF_CallbackDesc_s -- it is only ever set,
never read.
- now that this is done, all callbacks should only take a single argument,
and we can simplify things further.
This commit is contained in:
oster 2004-03-03 13:29:00 +00:00
parent 989ee1a393
commit 992f7c8269
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/raidframe/rf_callback.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_callback.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/* $NetBSD: rf_callback.h,v 1.5 2004/03/03 13:29:00 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -50,10 +50,7 @@ struct RF_CallbackDesc_s {
void (*callbackFunc) (RF_CBParam_t); /* function to call */
RF_CBParam_t callbackArg; /* args to give to function, or just
* info about this callback */
RF_CBParam_t callbackArg2;
RF_RowCol_t row; /* disk row and column IDs to give to the
* callback func */
RF_RowCol_t col;
RF_RowCol_t col; /* column IDs to give to the callback func */
RF_CallbackDesc_t *next;/* next entry in list */
};

5
sys/dev/raidframe/rf_raid1.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_raid1.c,v 1.21 2004/03/03 00:45:20 oster Exp $ */
/* $NetBSD: rf_raid1.c,v 1.22 2004/03/03 13:29:00 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.21 2004/03/03 00:45:20 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.22 2004/03/03 13:29:00 oster Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
@ -638,7 +638,6 @@ rf_SubmitReconBufferRAID1(RF_ReconBuffer_t *rbuf, int keep_it,
cb = rf_AllocCallbackDesc();
cb->col = rbuf->col;
cb->callbackArg.v = rbuf->parityStripeID;
cb->callbackArg2.v = rbuf->which_ru;
cb->next = NULL;
if (reconCtrlPtr->bufferWaitList == NULL) {
/* we are the wait list- lucky us */

5
sys/dev/raidframe/rf_reconbuffer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_reconbuffer.c,v 1.19 2004/03/03 00:45:20 oster Exp $ */
/* $NetBSD: rf_reconbuffer.c,v 1.20 2004/03/03 13:29:00 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -33,7 +33,7 @@
***************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.19 2004/03/03 00:45:20 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.20 2004/03/03 13:29:00 oster Exp $");
#include "rf_raid.h"
#include "rf_reconbuffer.h"
@ -229,7 +229,6 @@ rf_SubmitReconBufferBasic(RF_ReconBuffer_t *rbuf, int keep_it,
* recon ctrl structure */
cb->col = rbuf->col;
cb->callbackArg.v = rbuf->parityStripeID;
cb->callbackArg2.v = rbuf->which_ru;
cb->next = NULL;
if (!reconCtrlPtr->bufferWaitList)
reconCtrlPtr->bufferWaitList = cb;