[src/trunk]: src/sys/arch/usermode/dev Keep up with changes in ld(4): adding ...

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

details:   https://anonhg.NetBSD.org/src/rev/07d045b39d1f
branches:  trunk
changeset: 828972:07d045b39d1f
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat Jan 13 10:27:58 2018 +0000

description:
Keep up with changes in ld(4): adding ioctl handling on the ld(4) instead of
using the old dedicated ldflush() function.

diffstat:

 sys/arch/usermode/dev/ld_thunkbus.c |  25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 274ba72c9317 -r 07d045b39d1f sys/arch/usermode/dev/ld_thunkbus.c
--- a/sys/arch/usermode/dev/ld_thunkbus.c       Sat Jan 13 10:20:45 2018 +0000
+++ b/sys/arch/usermode/dev/ld_thunkbus.c       Sat Jan 13 10:27:58 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.31 2018/01/13 10:08:35 reinoud Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.32 2018/01/13 10:27:58 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,13 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.31 2018/01/13 10:08:35 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.32 2018/01/13 10:27:58 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
+#include <sys/bufq.h>
 #include <sys/disk.h>
 #include <sys/kmem.h>
 
@@ -48,7 +49,7 @@
 
 static int     ld_thunkbus_ldstart(struct ld_softc *, struct buf *);
 static int     ld_thunkbus_lddump(struct ld_softc *, void *, int, int);
-static int     ld_thunkbus_ldflush(struct ld_softc *, int);
+static int     ld_thunkbus_ioctl(struct ld_softc *, u_long, void *, int32_t, bool);
 
 //#define LD_USE_AIO
 
@@ -122,7 +123,7 @@
        ld->sc_maxqueuecnt = 1;
        ld->sc_start = ld_thunkbus_ldstart;
        ld->sc_dump = ld_thunkbus_lddump;
-       ld->sc_flush = ld_thunkbus_ldflush;
+       ld->sc_ioctl = ld_thunkbus_ioctl;
 
        sc->sc_ih = softint_establish(SOFTINT_BIO,
            ld_thunkbus_complete, ld);
@@ -315,13 +316,19 @@
        return 0;
 }
 
+
 static int
-ld_thunkbus_ldflush(struct ld_softc *ld, int flags)
+ld_thunkbus_ioctl(struct ld_softc *ld, u_long cmd, void *addr, int32_t flag,
+    bool poll)
 {
        struct ld_thunkbus_softc *sc = (struct ld_thunkbus_softc *)ld;
 
-       if (thunk_fsync(sc->sc_fd) == -1)
-               return thunk_geterrno();
-
-       return 0;
+       switch (cmd) {
+       case DIOCCACHESYNC:
+               if (thunk_fsync(sc->sc_fd) == -1)
+                       return thunk_geterrno();
+               return 0;
+       default:
+               return EPASSTHROUGH;
+       }
 }