[src/trunk]: src/sys/dev/dkwedge Implement and use a dkminphys() that calls t...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/20401c3f3b72
branches:  trunk
changeset: 750347:20401c3f3b72
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Dec 27 01:37:17 2009 +0000

description:
Implement and use a dkminphys() that calls the parent device's minphys
function with b_dev temporarily adjusted to the parent device's dev_t.

Fixes PR/37390.

diffstat:

 sys/dev/dkwedge/dk.c |  28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r 4f4ecc40dd65 -r 20401c3f3b72 sys/dev/dkwedge/dk.c
--- a/sys/dev/dkwedge/dk.c      Sun Dec 27 01:07:02 2009 +0000
+++ b/sys/dev/dkwedge/dk.c      Sun Dec 27 01:37:17 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dk.c,v 1.51 2009/09/08 21:14:33 pooka Exp $    */
+/*     $NetBSD: dk.c,v 1.52 2009/12/27 01:37:17 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.51 2009/09/08 21:14:33 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.52 2009/12/27 01:37:17 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -95,6 +95,7 @@
 static void    dkstart(struct dkwedge_softc *);
 static void    dkiodone(struct buf *);
 static void    dkrestart(void *);
+static void    dkminphys(struct buf *);
 
 static int     dklastclose(struct dkwedge_softc *);
 static int     dkwedge_detach(device_t, int);
@@ -1242,6 +1243,23 @@
 }
 
 /*
+ * dkminphys:
+ *
+ *     Call parent's minphys function.
+ */
+static void
+dkminphys(struct buf *bp)
+{
+       struct dkwedge_softc *sc = dkwedge_lookup(bp->b_dev);
+       dev_t dev;
+
+       dev = bp->b_dev;
+       bp->b_dev = sc->sc_pdev;
+       (*sc->sc_parent->dk_driver->d_minphys)(bp);
+       bp->b_dev = dev;
+}
+
+/*
  * dkread:             [devsw entry point]
  *
  *     Read from a wedge.
@@ -1254,8 +1272,7 @@
        if (sc->sc_state != DKW_STATE_RUNNING)
                return (ENXIO);
 
-       return (physio(dkstrategy, NULL, dev, B_READ,
-                      sc->sc_parent->dk_driver->d_minphys, uio));
+       return (physio(dkstrategy, NULL, dev, B_READ, dkminphys, uio));
 }
 
 /*
@@ -1271,8 +1288,7 @@
        if (sc->sc_state != DKW_STATE_RUNNING)
                return (ENXIO);
 
-       return (physio(dkstrategy, NULL, dev, B_WRITE,
-                      sc->sc_parent->dk_driver->d_minphys, uio));
+       return (physio(dkstrategy, NULL, dev, B_WRITE, dkminphys, uio));
 }
 
 /*