From bd56a12f18f70c29777b73da12c832fa17cfcd09 Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Sun, 19 Jul 2015 17:04:31 +0000
Subject: 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@
---
 sys/dev/softraid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys/dev/softraid.c')

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 21d56c17c58..ec2a5939aad 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.355 2015/07/19 16:12:10 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.356 2015/07/19 17:04:31 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -2025,7 +2025,7 @@ sr_ccb_rw(struct sr_discipline *sd, int chunk, daddr_t blkno,
 	else
 		ccb->ccb_buf.b_flags |= B_WRITE;
 
-	ccb->ccb_buf.b_blkno = blkno;
+	ccb->ccb_buf.b_blkno = blkno + sd->sd_meta->ssd_data_offset;
 	ccb->ccb_buf.b_bcount = len;
 	ccb->ccb_buf.b_bufsize = len;
 	ccb->ccb_buf.b_resid = len;
-- 
cgit v1.2.3-59-g8ed1b