Module Name: src
Committed By: jdolecek
Date: Sat Oct 13 07:23:34 UTC 2018
Modified Files:
src/sys/dev/ic [jdolecek-ncqfixes]: mvsata.c
Log Message:
add C_TIMEOUT KASSERT() on fail path of mvsata_bio_poll() for clarity
To generate a diff of this commit:
cvs rdiff -u -r1.41.2.7 -r1.41.2.8 src/sys/dev/ic/mvsata.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/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.41.2.7 src/sys/dev/ic/mvsata.c:1.41.2.8
--- src/sys/dev/ic/mvsata.c:1.41.2.7 Thu Oct 11 20:57:51 2018
+++ src/sys/dev/ic/mvsata.c Sat Oct 13 07:23:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.41.2.7 2018/10/11 20:57:51 jdolecek Exp $ */
+/* $NetBSD: mvsata.c,v 1.41.2.8 2018/10/13 07:23:34 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.41.2.7 2018/10/11 20:57:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.41.2.8 2018/10/13 07:23:34 jdolecek Exp $");
#include "opt_mvsata.h"
@@ -1281,8 +1281,10 @@ mvsata_bio_poll(struct ata_channel *chp,
chp->ch_flags &= ~ATACH_DMA_WAIT;
}
- if ((xfer->c_bio.flags & ATA_ITSDONE) == 0)
+ if ((xfer->c_bio.flags & ATA_ITSDONE) == 0) {
+ KASSERT(xfer->c_flags & C_TIMEOU);
mvsata_bio_intr(chp, xfer, 0);
+ }
}
static int