summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2010-10-19 11:55:58 +0000
committerrmacklem <rmacklem@FreeBSD.org>2010-10-19 11:55:58 +0000
commit9a0c150d2eb7898e81bbf63f17cf0bf6a9147a6c (patch)
tree0bb3f3d0e383cfc1f8af48fd6175eaaf0f787f90 /sys/fs
parentc4752b17171377483ae74146e0cac8e46081fd8d (diff)
downloadFreeBSD-src-9a0c150d2eb7898e81bbf63f17cf0bf6a9147a6c.zip
FreeBSD-src-9a0c150d2eb7898e81bbf63f17cf0bf6a9147a6c.tar.gz
Fix the type of the 3rd argument for nm_getinfo so that it works
for architectures like sparc64. Suggested by: kib MFC after: 2 weeks
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfsclient/nfs_clvfsops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index 816d288..d7245ee 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -101,7 +101,7 @@ static void nfs_decode_args(struct mount *mp, struct nfsmount *nmp,
static int mountnfs(struct nfs_args *, struct mount *,
struct sockaddr *, char *, u_char *, u_char *, u_char *,
struct vnode **, struct ucred *, struct thread *, int);
-static void nfs_getnlminfo(struct vnode *, uint8_t *, int *,
+static void nfs_getnlminfo(struct vnode *, uint8_t *, size_t *,
struct sockaddr_storage *, int *, off_t *);
static vfs_mount_t nfs_mount;
static vfs_cmount_t nfs_cmount;
@@ -1464,7 +1464,7 @@ nfs_sysctl(struct mount *mp, fsctlop_t op, struct sysctl_req *req)
* Extract the information needed by the nlm from the nfs vnode.
*/
static void
-nfs_getnlminfo(struct vnode *vp, uint8_t *fhp, int *fhlenp,
+nfs_getnlminfo(struct vnode *vp, uint8_t *fhp, size_t *fhlenp,
struct sockaddr_storage *sp, int *is_v3p, off_t *sizep)
{
struct nfsmount *nmp;
@@ -1472,7 +1472,7 @@ nfs_getnlminfo(struct vnode *vp, uint8_t *fhp, int *fhlenp,
nmp = VFSTONFS(vp->v_mount);
if (fhlenp != NULL)
- *fhlenp = np->n_fhp->nfh_len;
+ *fhlenp = (size_t)np->n_fhp->nfh_len;
if (fhp != NULL)
bcopy(np->n_fhp->nfh_fh, fhp, np->n_fhp->nfh_len);
if (sp != NULL)
OpenPOWER on IntegriCloud