[src/trunk]: src/sys/arch/usermode support disk images >= 2GB

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

details:   https://anonhg.NetBSD.org/src/rev/5981574d0c6f
branches:  trunk
changeset: 772511:5981574d0c6f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 06 14:11:55 2012 +0000

description:
support disk images >= 2GB

diffstat:

 sys/arch/usermode/dev/ld_thunkbus.c |  7 ++++---
 sys/arch/usermode/include/thunk.h   |  4 ++--
 sys/arch/usermode/usermode/thunk.c  |  6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r e080018e8c95 -r 5981574d0c6f sys/arch/usermode/dev/ld_thunkbus.c
--- a/sys/arch/usermode/dev/ld_thunkbus.c       Fri Jan 06 14:08:08 2012 +0000
+++ b/sys/arch/usermode/dev/ld_thunkbus.c       Fri Jan 06 14:11:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.25 2012/01/03 12:05:01 reinoud Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.26 2012/01/06 14:11:55 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.25 2012/01/03 12:05:01 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.26 2012/01/06 14:11:55 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -90,7 +90,8 @@
        struct ld_softc *ld = &sc->sc_ld;
        struct thunkbus_attach_args *taa = opaque;
        const char *path = taa->u.diskimage.path;
-       ssize_t size, blksize;
+       ssize_t blksize;
+       off_t size;
 
        ld->sc_dv = self;
 
diff -r e080018e8c95 -r 5981574d0c6f sys/arch/usermode/include/thunk.h
--- a/sys/arch/usermode/include/thunk.h Fri Jan 06 14:08:08 2012 +0000
+++ b/sys/arch/usermode/include/thunk.h Fri Jan 06 14:11:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.h,v 1.56 2012/01/05 12:12:58 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.57 2012/01/06 14:11:55 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -107,7 +107,7 @@
 int    thunk_execv(const char *, char * const []);
 
 int    thunk_open(const char *, int, mode_t);
-int    thunk_fstat_getsize(int, ssize_t *, ssize_t *);
+int    thunk_fstat_getsize(int, off_t *, ssize_t *);
 ssize_t        thunk_pread(int, void *, size_t, off_t);
 ssize_t        thunk_pwrite(int, const void *, size_t, off_t);
 ssize_t        thunk_read(int, void *, size_t);
diff -r e080018e8c95 -r 5981574d0c6f sys/arch/usermode/usermode/thunk.c
--- a/sys/arch/usermode/usermode/thunk.c        Fri Jan 06 14:08:08 2012 +0000
+++ b/sys/arch/usermode/usermode/thunk.c        Fri Jan 06 14:11:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.74 2012/01/05 12:12:58 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.75 2012/01/06 14:11:55 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.74 2012/01/05 12:12:58 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.75 2012/01/06 14:11:55 jmcneill Exp $");
 #endif
 
 #include <sys/types.h>
@@ -461,7 +461,7 @@
 }
 
 int
-thunk_fstat_getsize(int fd, ssize_t *size, ssize_t *blksize)
+thunk_fstat_getsize(int fd, off_t *size, ssize_t *blksize)
 {
        struct stat st;
        int error;