d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the type of the 3rd argument for nm_getinfo so that it works

Browse Source 
for architectures like sparc64.

Suggested by:	kib
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2010-10-19 11:55:58 +00:00
parent bcc5a93fd7
commit 4d4f9a3721
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=214053
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/nfsclient/nfs_clvfsops.c
View File

@ -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)

2
sys/nfs/nfs_mountcommon.h
View File

@ -34,7 +34,7 @@
* used by the nlm. It includes a function pointer that provides
* a mechanism for getting the client specific info for an nfs vnode.
*/
typedef void nfs_getinfofromvp_ftype(struct vnode *, uint8_t *, int *,
typedef void nfs_getinfofromvp_ftype(struct vnode *, uint8_t *, size_t *,
struct sockaddr_storage *, int *, off_t *);
struct nfsmount_common {

6
sys/nfsclient/nfs_vfsops.c
View File

@ -115,7 +115,7 @@ static void nfs_decode_args(struct mount *mp, struct nfsmount *nmp,
static int mountnfs(struct nfs_args *, struct mount *,
struct sockaddr *, char *, struct vnode **,
struct ucred *cred, 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;
@ -1498,7 +1498,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;
@ -1506,7 +1506,7 @@ nfs_getnlminfo(struct vnode *vp, uint8_t *fhp, int *fhlenp,
nmp = VFSTONFS(vp->v_mount);
if (fhlenp != NULL)
*fhlenp = np->n_fhsize;
*fhlenp = (size_t)np->n_fhsize;
if (fhp != NULL)
bcopy(np->n_fhp, fhp, np->n_fhsize);
if (sp != NULL)