Restore setting xs->bp; fixes ncr(4) on VAX.

ok miod@, krw@

8 files changed, 16 insertions, 8 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 189ddafc89c..47790550db6 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.173 2010/06/30 17:38:03 krw Exp $	*/
+/*	$OpenBSD: cd.c,v 1.174 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -663,6 +663,7 @@ cdstart(struct scsi_xfer *xs)
 	xs->datalen = bp->b_bcount;
 	xs->done = cd_buf_done;
 	xs->cookie = bp;
+	xs->bp = bp;
 
 	/* Instrumentation. */
 	disk_busy(&sc->sc_dk);
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index b6968beb068..62bde10fa29 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpath.c,v 1.16 2010/06/28 18:31:02 krw Exp $ */
+/*	$OpenBSD: mpath.c,v 1.17 2010/07/01 03:01:37 matthew Exp $ */
 
 /*
  * Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -163,6 +163,7 @@ mpath_cmd(struct scsi_xfer *xs)
 	mxs->datalen = xs->datalen;
 	mxs->retries = xs->retries;
 	mxs->timeout = xs->timeout;
+	mxs->bp = xs->bp;
 
 	mxs->cookie = xs;
 	mxs->done = mpath_done;
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 490fc9a68da..5e3edbfb464 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.176 2010/06/28 09:11:21 dlg Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.177 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -1212,6 +1212,7 @@ scsi_scsi_cmd(struct scsi_link *link, struct scsi_generic *scsi_cmd,
 	xs->datalen = datalen;
 	xs->retries = retries;
 	xs->timeout = timeout;
+	xs->bp = bp;
 
 	error = scsi_xs_sync(xs);
 
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 79cd0b93a82..542364e06e0 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.199 2010/06/30 19:06:29 kettenis Exp $	*/
+/*	$OpenBSD: sd.c,v 1.200 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -727,6 +727,7 @@ sdstart(struct scsi_xfer *xs)
 
 	xs->done = sd_buf_done;
 	xs->cookie = bp;
+	xs->bp = bp;
 
 	/* Instrumentation. */
 	disk_busy(&sc->sc_dk);
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index ee4a49352d0..b240f3131ac 100644
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ss.c,v 1.77 2010/06/30 00:02:00 dlg Exp $	*/
+/*	$OpenBSD: ss.c,v 1.78 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $	*/
 
 /*
@@ -655,6 +655,7 @@ ssstart(struct scsi_xfer *xs)
 		xs->timeout = 100000;
 		xs->done = ssdone;
 		xs->cookie = bp;
+		xs->bp = bp;
 
 		scsi_xs_exec(xs);
 	}
diff --git a/sys/scsi/ss_mustek.c b/sys/scsi/ss_mustek.c
index 42f13c99de7..4e51ab8c9c0 100644
--- a/sys/scsi/ss_mustek.c
+++ b/sys/scsi/ss_mustek.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ss_mustek.c,v 1.25 2010/06/30 00:02:00 dlg Exp $	*/
+/*	$OpenBSD: ss_mustek.c,v 1.26 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: ss_mustek.c,v 1.4 1996/05/05 19:52:57 christos Exp $	*/
 
 /*
@@ -460,6 +460,7 @@ mustek_read(ss, xs, bp)
 	xs->flags |= SCSI_DATA_IN;
 	xs->done = mustek_read_done;
 	xs->cookie = bp;
+	xs->bp = bp;
 
 	scsi_xs_exec(xs);
 
diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c
index ef82988c0b1..771810ff8b5 100644
--- a/sys/scsi/ss_scanjet.c
+++ b/sys/scsi/ss_scanjet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ss_scanjet.c,v 1.42 2010/06/30 00:02:00 dlg Exp $	*/
+/*	$OpenBSD: ss_scanjet.c,v 1.43 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $	*/
 
 /*
@@ -297,6 +297,7 @@ scanjet_read(ss, xs, bp)
 	xs->timeout = 100000;
 	xs->done = scanjet_read_done;
 	xs->cookie = bp;
+	xs->bp = bp;
 
 	scsi_xs_exec(xs);
 
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 2499fe3c2ec..0d3f4513c30 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.102 2010/06/30 02:17:25 matthew Exp $	*/
+/*	$OpenBSD: st.c,v 1.103 2010/07/01 03:01:37 matthew Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -1036,6 +1036,7 @@ ststart(struct scsi_xfer *xs)
 	xs->datalen = bp->b_bcount;
 	xs->done = st_buf_done;
 	xs->cookie = bp;
+	xs->bp = bp;
 
 	/*
 	 * go ask the adapter to do all this for us