Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build fixes for LP64

This commit is contained in:
manu 2010-09-06 01:17:05 +00:00
parent 1d94059094
commit 6f8501feb8
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libperfuse/ops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ops.c,v 1.9 2010/09/05 06:49:13 manu Exp $ */
/* $NetBSD: ops.c,v 1.10 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@ -416,7 +416,7 @@ fuse_to_dirent(pu, opc, fd, fd_len)
fd_offset = 0;
written = 0;
dents = PERFUSE_NODE_DATA(opc)->pnd_dirent;
dents_len = PERFUSE_NODE_DATA(opc)->pnd_dirent_len;
dents_len = (size_t)PERFUSE_NODE_DATA(opc)->pnd_dirent_len;
do {
char *ndp;
@ -569,7 +569,8 @@ readdir_buffered(ps, opc, dent, readoff,
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags & PDF_READDIR)
DPRINTF("%s: readoff = %"PRId64", pnd->pnd_dirent_len = %zd\n",
DPRINTF("%s: readoff = %"PRId64", "
"pnd->pnd_dirent_len = %"PRId64"\n",
__func__, *readoff, pnd->pnd_dirent_len);
#endif
if (*readoff >= pnd->pnd_dirent_len) {
@ -1067,7 +1068,7 @@ perfuse_node_mknod(pu, opc, pni, pcn, vap)
pm = ps->ps_new_msg(pu, opc, FUSE_MKNOD, len, pcn->pcn_cred);
fmi = GET_INPAYLOAD(ps, pm, fuse_mknod_in);
fmi->mode = vap->va_mode | VTTOIF(vap->va_type);
fmi->rdev = vap->va_rdev;
fmi->rdev = (uint32_t)vap->va_rdev;
fmi->umask = 0; /* Seems unused bu libfuse */
(void)strlcpy((char *)(void *)(fmi + 1), path, len - sizeof(*fmi));

4
lib/libperfuse/perfuse_if.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: perfuse_if.h,v 1.4 2010/09/01 14:57:24 manu Exp $ */
/* $NetBSD: perfuse_if.h,v 1.5 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@ -153,7 +153,7 @@ struct perfuse_mount_out {
size_t pmo_source_len;
size_t pmo_target_len;
size_t pmo_filesystemtype_len;
int pmo_mountflags;
long pmo_mountflags;
size_t pmo_data_len;
};

4
lib/libperfuse/perfuse_priv.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: perfuse_priv.h,v 1.6 2010/09/05 06:49:13 manu Exp $ */
/* $NetBSD: perfuse_priv.h,v 1.7 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@ -88,7 +88,7 @@ struct perfuse_node_data {
uint64_t pnd_offset; /* seek state */
uint64_t pnd_lock_owner;
struct dirent *pnd_dirent; /* native buffer for readdir */
size_t pnd_dirent_len;
off_t pnd_dirent_len;
struct fuse_dirent *pnd_all_fd; /* FUSE buffer for readdir */
size_t pnd_all_fd_len;
TAILQ_HEAD(,perfuse_cc_queue) pnd_pcq; /* queued requests */