Module Name: src
Committed By: christos
Date: Tue Jan 5 18:44:34 UTC 2016
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
revert bp->b_error checking; biowait() is a no-op in that case and it is
valid to call biowait() after biodone. (thanks chuq)
To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.339 src/sys/dev/raidframe/rf_netbsdkintf.c:1.340
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.339 Tue Jan 5 12:06:34 2016
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Jan 5 13:44:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.339 2016/01/05 17:06:34 mlelstv Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.340 2016/01/05 18:44:34 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.339 2016/01/05 17:06:34 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.340 2016/01/05 18:44:34 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2323,9 +2323,7 @@ raidread_component_area(dev_t dev, struc
bp->b_resid = dsize;
bdev_strategy(bp);
- error = bp->b_error;
- if (!error)
- error = biowait(bp);
+ error = biowait(bp);
if (!error) {
memcpy(data, bp->b_data, msize);
@@ -2370,9 +2368,7 @@ raidwrite_component_area(dev_t dev, stru
bdev_strategy(bp);
if (asyncp)
return 0;
- error = bp->b_error;
- if (!error)
- error = biowait(bp);
+ error = biowait(bp);
brelse(bp, 0);
if (error) {
#if 1
