summaryrefslogtreecommitdiff
path: root/sys/dev/softraid_raid1.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-03-26 11:20:35 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-03-26 11:20:35 +0000
commit4cdc1608fbd291f04585f5723b81be1d88ce479c (patch)
tree3e8b36884e6a3469a535ff798ce6d892467520f4 /sys/dev/softraid_raid1.c
parent45fb961144283938ed9a1de5232a62d70fe0b55d (diff)
Add storage for the boot block and boot loader to the softraid metadata.
Also add a new optional metadata type for boot data. This is the first step (of many) towards being able to boot from softraid volumes. WARNING: This version of the softraid metadata is not compatible with previous versions. As a result, any softraid volumes created with older kernels will not assemble. Data on existing softraid volumes should be backed up before upgrading. The volume should then be recreated and the data restored. ok marco@
Diffstat (limited to 'sys/dev/softraid_raid1.c')
-rw-r--r--sys/dev/softraid_raid1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index 343e390a027..916defebe94 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.22 2010/01/09 23:15:06 krw Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.23 2010/03/26 11:20:34 jsing Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
*
@@ -381,7 +381,7 @@ sr_raid1_rw(struct sr_workunit *wu)
goto bad;
/* calculate physical block */
- blk += SR_META_SIZE + SR_META_OFFSET;
+ blk += SR_DATA_OFFSET;
if (xs->flags & SCSI_DATA_IN)
ios = 1;