Module Name: src
Committed By: snj
Date: Mon Mar 7 17:38:23 UTC 2011
Modified Files:
src/sys/dev/raidframe [netbsd-5]: rf_paritymap.c
Log Message:
Pull up following revision(s) (requested by riz in ticket #1569):
sys/dev/raidframe/rf_paritymap.c: revision 1.6
Always return at least one parity region. Fixes PR#44239.
Fix from oster@, code (such as it is) by me.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/dev/raidframe/rf_paritymap.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_paritymap.c
diff -u src/sys/dev/raidframe/rf_paritymap.c:1.3.2.3 src/sys/dev/raidframe/rf_paritymap.c:1.3.2.4
--- src/sys/dev/raidframe/rf_paritymap.c:1.3.2.3 Sat Mar 6 21:05:29 2010
+++ src/sys/dev/raidframe/rf_paritymap.c Mon Mar 7 17:38:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $ */
+/* $NetBSD: rf_paritymap.c,v 1.3.2.4 2011/03/07 17:38:22 snj Exp $ */
/*-
* Copyright (c) 2009 Jed Davis.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.4 2011/03/07 17:38:22 snj Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -409,6 +409,8 @@
nreg = bytes_per_disk / REGION_MINSIZE;
if (nreg > RF_PARITYMAP_NREG)
nreg = RF_PARITYMAP_NREG;
+ if (nreg < 1)
+ nreg = 1;
return (u_int)nreg;
}
