Module Name: src
Committed By: jmcneill
Date: Fri Jan 6 14:11:55 UTC 2012
Modified Files:
src/sys/arch/usermode/dev: ld_thunkbus.c
src/sys/arch/usermode/include: thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
support disk images >= 2GB
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/usermode/dev/ld_thunkbus.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/usermode/usermode/thunk.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/arch/usermode/dev/ld_thunkbus.c
diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.25 src/sys/arch/usermode/dev/ld_thunkbus.c:1.26
--- src/sys/arch/usermode/dev/ld_thunkbus.c:1.25 Tue Jan 3 12:05:01 2012
+++ src/sys/arch/usermode/dev/ld_thunkbus.c Fri Jan 6 14:11:55 2012
@@ -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 <[email protected]>
@@ -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 @@ ld_thunkbus_attach(device_t parent, devi
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;
Index: src/sys/arch/usermode/include/thunk.h
diff -u src/sys/arch/usermode/include/thunk.h:1.56 src/sys/arch/usermode/include/thunk.h:1.57
--- src/sys/arch/usermode/include/thunk.h:1.56 Thu Jan 5 12:12:58 2012
+++ src/sys/arch/usermode/include/thunk.h Fri Jan 6 14:11:55 2012
@@ -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 <[email protected]>
@@ -107,7 +107,7 @@ void thunk_putchar(int);
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);
Index: src/sys/arch/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.74 src/sys/arch/usermode/usermode/thunk.c:1.75
--- src/sys/arch/usermode/usermode/thunk.c:1.74 Thu Jan 5 12:12:58 2012
+++ src/sys/arch/usermode/usermode/thunk.c Fri Jan 6 14:11:55 2012
@@ -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 <[email protected]>
@@ -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 @@ thunk_open(const char *path, int flags,
}
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;
