PR/47879: Takahiro HAYASHI: vnd cannot handle disk image larger than 2TiB

change size_t to uint64_t where needed.
This commit is contained in:
christos 2013-06-03 16:42:32 +00:00
parent c97206f9de
commit 417a118725
2 changed files with 5 additions and 5 deletions

View File

@ -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 *data, int flag, struct lwp *l)
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;

View File

@ -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 */