[src/trunk]: src/sys/dev PR/47879: Takahiro HAYASHI: vnd cannot handle disk i...

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

details:   https://anonhg.NetBSD.org/src/rev/5c33fee0f97c
branches:  trunk
changeset: 787132:5c33fee0f97c
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 03 16:42:32 2013 +0000

description:
PR/47879: Takahiro HAYASHI: vnd cannot handle disk image larger than 2TiB
change size_t to uint64_t where needed.

diffstat:

 sys/dev/vnd.c    |  6 +++---
 sys/dev/vndvar.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a48762073e60 -r 5c33fee0f97c sys/dev/vnd.c
--- a/sys/dev/vnd.c     Mon Jun 03 16:21:50 2013 +0000
+++ b/sys/dev/vnd.c     Mon Jun 03 16:42:32 2013 +0000
@@ -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 @@
        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;
diff -r a48762073e60 -r 5c33fee0f97c sys/dev/vndvar.h
--- a/sys/dev/vndvar.h  Mon Jun 03 16:21:50 2013 +0000
+++ b/sys/dev/vndvar.h  Mon Jun 03 16:42:32 2013 +0000
@@ -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 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 */