diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2010-07-02 09:20:27 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2010-07-02 09:20:27 +0000 |
| commit | cd6ccffddddc24f67b61d2155e9afd2c39e3463f (patch) | |
| tree | ae54dd8c2e5ccdda545685105cba424be181d437 /sys/dev/softraid_crypto.c | |
| parent | fc8a6fc3fb9a9b35949ff28904a728e25a77bbed (diff) | |
Determine the data offset using a variable specified within the softraid
metadata. This allows us to implement seamless transitions from the
previous metadata version to the current version, avoiding the need to
recreate the softraid volume.
Joint work with marco@ during c2k10.
ok marco@
Diffstat (limited to 'sys/dev/softraid_crypto.c')
| -rw-r--r-- | sys/dev/softraid_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 6cf972097e5..e8e0ce9436b 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.52 2010/05/18 04:41:14 dlg Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.53 2010/07/02 09:20:26 jsing Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -1165,7 +1165,7 @@ sr_crypto_rw2(struct sr_workunit *wu, struct cryptop *crp) if (sr_validate_io(wu, &blk, "sr_crypto_rw2")) goto bad; - blk += SR_DATA_OFFSET; + blk += sd->sd_meta->ssd_data_offset; wu->swu_io_count = 1; |