summaryrefslogtreecommitdiffstats
path: root/sys/dev/softraid_raid1.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2015-07-19 17:04:31 +0000
committerkrw <krw@openbsd.org>2015-07-19 17:04:31 +0000
commitbd56a12f18f70c29777b73da12c832fa17cfcd09 (patch)
tree4d30cc032e41214dc6c517fab8b43efa515bdb80 /sys/dev/softraid_raid1.c
parentAdd proper kernel locking in the fpe_branch_emulate() function, to (diff)
downloadwireguard-openbsd-bd56a12f18f70c29777b73da12c832fa17cfcd09.tar.xz
wireguard-openbsd-bd56a12f18f70c29777b73da12c832fa17cfcd09.zip
Stop adding and subtracting data offset. Just keep to chunk relative
block offsets until actual i/o is constructed and needs the physical offset. Eliminate a number of <<DEV_BSIZE shifts as a bonus. No intentional functional change. Fixed and ok jsing@
Diffstat (limited to 'sys/dev/softraid_raid1.c')
-rw-r--r--sys/dev/softraid_raid1.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index b88d1411f94..d1bc6e776f7 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.60 2015/01/27 10:12:45 dlg Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.61 2015/07/19 17:04:31 krw Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
*
@@ -336,9 +336,6 @@ sr_raid1_rw(struct sr_workunit *wu)
if (sr_validate_io(wu, &blk, "sr_raid1_rw"))
goto bad;
- /* calculate physical block */
- blk += sd->sd_meta->ssd_data_offset;
-
if (xs->flags & SCSI_DATA_IN)
ios = 1;
else