Module Name: src
Committed By: jakllsch
Date: Sun Dec 27 01:37:17 UTC 2009
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/dkwedge/dk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.51 src/sys/dev/dkwedge/dk.c:1.52
--- src/sys/dev/dkwedge/dk.c:1.51 Tue Sep 8 21:14:33 2009
+++ src/sys/dev/dkwedge/dk.c Sun Dec 27 01:37:17 2009
@@ -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));
}
/*
