diff options
| author | christos <christos@NetBSD.org> | 2019-10-10 03:43:59 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2019-10-10 03:43:59 +0000 |
| commit | 9272c73468bdffa4fc762a5644c8422c1a732028 (patch) | |
| tree | fb9a4f55c6c6a2bc4bec8a5b3cafad08a84a017a /sys/dev/raidframe/rf_diskqueue.h | |
| parent | 31f7820d5afa7b46463906b36d24bae5090f5cd0 (diff) | |
fix the function pointer and callback mess:
- callback functions return 0 and their result is not checked; make them void.
- there are two types of callbacks and they used to overload their parameters
and the callback structure; separate them into "function" and "value"
callbacks.
- make the wait function signature consistent.
Diffstat (limited to 'sys/dev/raidframe/rf_diskqueue.h')
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index 5416dfcfc96..6b0728bdb7c 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.24 2011/05/05 06:04:09 mrg Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.25 2019/10/10 03:43:59 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -62,7 +62,7 @@ struct RF_DiskQueueData_s { * access is for */ RF_ReconUnitNum_t which_ru; /* which RU within this parity stripe */ int priority; /* the priority of this request */ - int (*CompleteFunc) (void *, int); /* function to be called upon + void (*CompleteFunc) (void *, int); /* function to be called upon * completion */ void *argument; /* argument to be passed to CompleteFunc */ RF_Raid_t *raidPtr; /* needed for simulation */ @@ -141,7 +141,7 @@ int rf_DiskIOPromote(RF_DiskQueue_t *, RF_StripeNum_t, RF_ReconUnitNum_t); RF_DiskQueueData_t *rf_CreateDiskQueueData(RF_IoType_t, RF_SectorNum_t, RF_SectorCount_t , void *, RF_StripeNum_t, RF_ReconUnitNum_t, - int (*wakeF) (void *, int), + void (*wakeF) (void *, int), void *, RF_AccTraceEntry_t *, RF_Raid_t *, RF_DiskQueueDataFlags_t, |
