CVS commit: src/sys/dev/raidframe

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Tue Mar  1 22:51:14 UTC 2011

Modified Files:
        src/sys/dev/raidframe: rf_paritymap.c

Log Message:
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.5 -r1.6 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.5 src/sys/dev/raidframe/rf_paritymap.c:1.6
--- src/sys/dev/raidframe/rf_paritymap.c:1.5	Sun Mar 14 21:11:41 2010
+++ src/sys/dev/raidframe/rf_paritymap.c	Tue Mar  1 22:51:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritymap.c,v 1.5 2010/03/14 21:11:41 jld Exp $ */
+/* $NetBSD: rf_paritymap.c,v 1.6 2011/03/01 22:51:14 riz Exp $ */
 
 /*-
  * Copyright (c) 2009 Jed Davis.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.5 2010/03/14 21:11:41 jld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.6 2011/03/01 22:51:14 riz 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;
 }