summaryrefslogtreecommitdiffstats
path: root/sys/dev/softraid_concat.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_concat.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_concat.c')
-rw-r--r--sys/dev/softraid_concat.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/softraid_concat.c b/sys/dev/softraid_concat.c
index 5ca40cad47e..eeeade12cf1 100644
--- a/sys/dev/softraid_concat.c
+++ b/sys/dev/softraid_concat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_concat.c,v 1.21 2013/11/22 03:47:07 krw Exp $ */
+/* $OpenBSD: softraid_concat.c,v 1.22 2015/07/19 17:04:31 krw Exp $ */
/*
* Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2011 Joel Sing <jsing@openbsd.org>
@@ -134,7 +134,6 @@ sr_concat_rw(struct sr_workunit *wu)
goto bad;
length = MIN(MIN(leftover, chunkend - lbaoffs), MAXPHYS);
- physoffs += sd->sd_meta->ssd_data_offset << DEV_BSHIFT;
/* make sure chunk is online */
scp = sd->sd_vol.sv_chunks[chunk];