diff options
| -rw-r--r-- | sbin/bioctl/bioctl.8 | 19 | ||||
| -rw-r--r-- | sbin/bioctl/bioctl.c | 6 | ||||
| -rw-r--r-- | share/man/man4/softraid.4 | 24 |
3 files changed, 24 insertions, 25 deletions
diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8 index 91042b98892..5dc38e433f4 100644 --- a/sbin/bioctl/bioctl.8 +++ b/sbin/bioctl/bioctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bioctl.8,v 1.92 2013/08/11 05:54:09 brad Exp $ +.\" $OpenBSD: bioctl.8,v 1.93 2014/01/18 09:11:12 jsing Exp $ .\" .\" Copyright (c) 2004, 2005 Marco Peereboom .\" @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: August 11 2013 $ +.Dd $Mdocdate: January 18 2014 $ .Dt BIOCTL 8 .Os .Sh NAME @@ -194,12 +194,9 @@ A striping discipline. .It 1 RAID 1: A mirroring discipline. -.It 4 -RAID 4: -A striping discipline with fixed parity chunk. -.It 5 -RAID 5: -A striping discipline with floating parity chunk. +.\" .It 5 +.\" RAID 5: +.\" A striping discipline with floating parity chunk. .It C CRYPTO: An encrypting discipline. @@ -210,8 +207,8 @@ A concatenating discipline. .Pp The RAID 0, RAID 1 and CONCAT disciplines require a minimum of two devices to be provided via -.Fl l , -RAID 4 and RAID 5 require at least three devices, +.Fl l +.\" RAID 5 requires at least three devices, and the CRYPTO discipline requires exactly one. .It Fl d Delete volume specified by device. @@ -321,5 +318,3 @@ interface was written by .An Marco Peereboom Aq Mt marco@openbsd.org . .Sh CAVEATS Only devices with 512-byte sectors are supported. -.Pp -Use of the CRYPTO & RAID 4/5 disciplines are currently considered experimental. diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c index fa6784f753a..a3d68c18118 100644 --- a/sbin/bioctl/bioctl.c +++ b/sbin/bioctl/bioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bioctl.c,v 1.118 2014/01/18 09:01:01 jsing Exp $ */ +/* $OpenBSD: bioctl.c,v 1.119 2014/01/18 09:11:12 jsing Exp $ */ /* * Copyright (c) 2004, 2005 Marco Peereboom @@ -851,17 +851,21 @@ bio_createraid(u_int16_t level, char *dev_list, char *key_disk) case 1: min_disks = 2; break; +#ifdef RAID5 case 5: min_disks = 3; break; +#endif /* RAID5 */ case 'C': min_disks = 1; break; case 'c': min_disks = 2; break; +#ifdef AOE case 'a': break; +#endif /* AOE */ default: errx(1, "unsupported raid level"); } diff --git a/share/man/man4/softraid.4 b/share/man/man4/softraid.4 index e6b592c3fdf..65760e1a6d2 100644 --- a/share/man/man4/softraid.4 +++ b/share/man/man4/softraid.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: softraid.4,v 1.34 2014/01/18 09:01:01 jsing Exp $ +.\" $OpenBSD: softraid.4,v 1.35 2014/01/18 09:11:12 jsing Exp $ .\" .\" Copyright (c) 2007 Todd T. Fries <todd@OpenBSD.org> .\" Copyright (c) 2007 Marco Peereboom <marco@OpenBSD.org> @@ -78,14 +78,14 @@ though at the cost of write speed. Unlike traditional RAID 1, .Nm supports the use of more than two chunks in a RAID 1 setup. -.It RAID 5 -A striping discipline with -.Em floating parity -across all chunks. -It stripes data across chunks and provides parity to prevent data loss of -a single chunk failure. -Read performance is increased; -write performance does incur additional overhead. +.\" .It RAID 5 +.\" A striping discipline with +.\" .Em floating parity +.\" across all chunks. +.\" It stripes data across chunks and provides parity to prevent data loss of +.\" a single chunk failure. +.\" Read performance is increased; +.\" write performance does incur additional overhead. .It CRYPTO An .Em encrypting @@ -195,9 +195,9 @@ The RAID 1 discipline does not initialize the mirror upon creation. This is by design because all sectors that are read are written first. There is no point in wasting a lot of time syncing random data. .Pp -The RAID 5 discipline do not initialize the parity upon creation. -This is due to the scrub functionality not being currently implemented. -.Pp +.\" The RAID 5 discipline do not initialize the parity upon creation. +.\" This is due to the scrub functionality not being currently implemented. +.\" .Pp Currently there is no automated mechanism to recover from failed disks. .Pp Sparc hardware needs to use fstype |