Module Name: src
Committed By: jakllsch
Date: Sat Jul 30 04:42:04 UTC 2011
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Add some additional consistency checking paranoia with KASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.386 -r1.387 src/sys/dev/ata/wd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.386 src/sys/dev/ata/wd.c:1.387
--- src/sys/dev/ata/wd.c:1.386 Thu Feb 10 05:07:46 2011
+++ src/sys/dev/ata/wd.c Sat Jul 30 04:42:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $ */
+/* $NetBSD: wd.c,v 1.387 2011/07/30 04:42:03 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.387 2011/07/30 04:42:03 jakllsch Exp $");
#include "opt_ata.h"
@@ -703,6 +703,7 @@
wd->sc_wdc_bio.bcount = bp->b_bcount;
wd->sc_wdc_bio.databuf = bp->b_data;
wd->sc_wdc_bio.blkdone =0;
+ KASSERT(bp == wd->sc_bp || wd->sc_bp == NULL);
wd->sc_bp = bp;
/*
* If we're retrying, retry in single-sector mode. This will give us
@@ -829,6 +830,8 @@
biodone(bp);
wd->openings++;
}
+ KASSERT(wd->sc_bp != NULL);
+ wd->sc_bp = NULL;
wdstart(wd);
}
