Module Name: src
Committed By: christos
Date: Mon Jun 3 16:42:32 UTC 2013
Modified Files:
src/sys/dev: vnd.c vndvar.h
Log Message:
PR/47879: Takahiro HAYASHI: vnd cannot handle disk image larger than 2TiB
change size_t to uint64_t where needed.
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/dev/vnd.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/vndvar.h
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/vnd.c
diff -u src/sys/dev/vnd.c:1.222 src/sys/dev/vnd.c:1.223
--- src/sys/dev/vnd.c:1.222 Tue May 28 20:47:48 2013
+++ src/sys/dev/vnd.c Mon Jun 3 12:42:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.222 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: vnd.c,v 1.223 2013/06/03 16:42:32 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.222 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.223 2013/06/03 16:42:32 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1021,7 +1021,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
struct pathbuf *pb;
struct nameidata nd;
int error, part, pmask;
- size_t geomsize;
+ uint64_t geomsize;
int fflags;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel newlabel;
Index: src/sys/dev/vndvar.h
diff -u src/sys/dev/vndvar.h:1.32 src/sys/dev/vndvar.h:1.33
--- src/sys/dev/vndvar.h:1.32 Mon Mar 26 12:28:08 2012
+++ src/sys/dev/vndvar.h Mon Jun 3 12:42:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.32 2012/03/26 16:28:08 hannken Exp $ */
+/* $NetBSD: vndvar.h,v 1.33 2013/06/03 16:42:32 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@ struct vnode;
struct vnd_softc {
device_t sc_dev;
int sc_flags; /* flags */
- size_t sc_size; /* size of vnd */
+ uint64_t sc_size; /* size of vnd */
struct vnode *sc_vp; /* vnode */
kauth_cred_t sc_cred; /* credentials */
int sc_maxactive; /* max # of active requests */
