From 494d7fa59183a13df1c40639cbb435206f6886f0 Mon Sep 17 00:00:00 2001 From: des Date: Sat, 7 Apr 2007 19:11:41 +0000 Subject: Fix some type mismatches. Reviewed by: pjd@ --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 6 +++--- sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 6769177..5f74eb8 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -201,7 +201,7 @@ zfs_close(ap) * data (cmd == _FIO_SEEK_DATA). "off" is an in/out parameter. */ static int -zfs_holey(vnode_t *vp, int cmd, offset_t *off) +zfs_holey(vnode_t *vp, unsigned long cmd, offset_t *off) { znode_t *zp = VTOZ(vp); uint64_t noff = (uint64_t)*off; /* new offset */ @@ -3065,11 +3065,11 @@ zfs_pathconf(ap) struct vop_pathconf_args /* { struct vnode *a_vp; int a_name; - int *a_retval; + register_t *a_retval; } */ *ap; { int cmd = ap->a_name; - int *valp = ap->a_retval; + register_t *valp = ap->a_retval; #if 0 vnode_t *vp = ap->a_vp; znode_t *zp, *xzp; diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 6769177..5f74eb8 100644 --- a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -201,7 +201,7 @@ zfs_close(ap) * data (cmd == _FIO_SEEK_DATA). "off" is an in/out parameter. */ static int -zfs_holey(vnode_t *vp, int cmd, offset_t *off) +zfs_holey(vnode_t *vp, unsigned long cmd, offset_t *off) { znode_t *zp = VTOZ(vp); uint64_t noff = (uint64_t)*off; /* new offset */ @@ -3065,11 +3065,11 @@ zfs_pathconf(ap) struct vop_pathconf_args /* { struct vnode *a_vp; int a_name; - int *a_retval; + register_t *a_retval; } */ *ap; { int cmd = ap->a_name; - int *valp = ap->a_retval; + register_t *valp = ap->a_retval; #if 0 vnode_t *vp = ap->a_vp; znode_t *zp, *xzp; -- cgit v1.1