summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/raidframe/raidframevar.h4
-rw-r--r--sys/dev/raidframe/rf_layout.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/raidframe/raidframevar.h b/sys/dev/raidframe/raidframevar.h
index 54228c27aae..297debebc64 100644
--- a/sys/dev/raidframe/raidframevar.h
+++ b/sys/dev/raidframe/raidframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.5 2003/12/29 02:38:17 oster Exp $ */
+/* $NetBSD: raidframevar.h,v 1.6 2004/01/04 06:37:16 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -281,7 +281,6 @@ typedef enum RF_AccessState_e {
/* original states */
rf_QuiesceState, /* handles queisence for reconstruction */
rf_IncrAccessesCountState, /* count accesses in flight */
- rf_DecrAccessesCountState,
rf_MapState, /* map access to disk addresses */
rf_LockState, /* take stripe locks */
rf_CreateDAGState, /* create DAGs */
@@ -289,6 +288,7 @@ typedef enum RF_AccessState_e {
rf_ProcessDAGState, /* DAGs are completing- check if correct,
* or if we need to retry */
rf_CleanupState, /* release stripe locks, clean up */
+ rf_DecrAccessesCountState,
rf_LastState /* must be the last state */
} RF_AccessState_t;
diff --git a/sys/dev/raidframe/rf_layout.c b/sys/dev/raidframe/rf_layout.c
index 50ff56e0229..553f1efb965 100644
--- a/sys/dev/raidframe/rf_layout.c
+++ b/sys/dev/raidframe/rf_layout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_layout.c,v 1.15 2003/12/30 21:59:03 oster Exp $ */
+/* $NetBSD: rf_layout.c,v 1.16 2004/01/04 06:37:16 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.15 2003/12/30 21:59:03 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.16 2004/01/04 06:37:16 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -85,8 +85,8 @@ static const RF_AccessState_t DefaultStates[] = {
rf_CreateDAGState,
rf_ExecuteDAGState,
rf_ProcessDAGState,
- rf_DecrAccessesCountState,
rf_CleanupState,
+ rf_DecrAccessesCountState,
rf_LastState};
#define RF_NU(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p