46 lines
1.6 KiB
Plaintext
46 lines
1.6 KiB
Plaintext
$NetBSD: patch-am,v 1.1.1.1 2005/05/04 08:56:50 agc Exp $
|
|
|
|
Index: drive/nasd_cbasic.c
|
|
===================================================================
|
|
RCS file: /usr/cvsroot/nasd/nasd-1.3/drive/nasd_cbasic.c,v
|
|
retrieving revision 1.1.1.1
|
|
retrieving revision 1.2
|
|
diff -u -r1.1.1.1 -r1.2
|
|
--- drive/nasd_cbasic.c 21 Mar 2005 08:52:02 -0000 1.1.1.1
|
|
+++ drive/nasd_cbasic.c 21 Mar 2005 17:07:23 -0000 1.2
|
|
@@ -399,7 +399,7 @@
|
|
return(rc);
|
|
}
|
|
|
|
- NASD_ODC_Q_INS_NOLOCK(&nasd_odc_unusedq,ent,l);
|
|
+ NASD_ODC_Q_INS_NOLOCK(&nasd_odc_unusedq,ent,lnext,lprev);
|
|
}
|
|
|
|
nasd_printf("DRIVE: allocated cache\n");
|
|
@@ -487,7 +487,7 @@
|
|
|
|
for(i=0;i<NASD_ODC_NLRUS;i++) {
|
|
while(NASD_ODC_Q_SIZE(&nasd_odc_lru[i])) {
|
|
- NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_lru[i],ent,l);
|
|
+ NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_lru[i],ent,lnext,lprev);
|
|
nasd_odc_free_ent(ent);
|
|
}
|
|
NASD_ASSERT(nasd_odc_lru[i].head.lprev == &nasd_odc_lru[i].head);
|
|
@@ -495,14 +495,14 @@
|
|
}
|
|
|
|
while(NASD_ODC_Q_SIZE(&nasd_odc_unusedq)) {
|
|
- NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_unusedq,ent,l);
|
|
+ NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_unusedq,ent,lnext,lprev);
|
|
nasd_odc_free_ent(ent);
|
|
}
|
|
NASD_ASSERT(nasd_odc_unusedq.head.lprev == &nasd_odc_unusedq.head);
|
|
NASD_ASSERT(nasd_odc_unusedq.head.lnext == &nasd_odc_unusedq.head);
|
|
|
|
while(NASD_ODC_Q_SIZE(&nasd_odc_wireq)) {
|
|
- NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_wireq,ent,w);
|
|
+ NASD_ODC_Q_DEQ_TAIL_NOLOCK(&nasd_odc_wireq,ent,wnext,wprev);
|
|
nasd_odc_free_ent(ent);
|
|
}
|
|
NASD_ASSERT(nasd_odc_wireq.head.lprev == &nasd_odc_wireq.head);
|