summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2007-04-07 19:11:41 +0000
committerdes <des@FreeBSD.org>2007-04-07 19:11:41 +0000
commit494d7fa59183a13df1c40639cbb435206f6886f0 (patch)
treecc92dec86a5fd20857136e44a8c52de0ac28064a
parent2b4a45b0fccb1dd7227a46f5ac75f99b6e116cf8 (diff)
downloadFreeBSD-src-494d7fa59183a13df1c40639cbb435206f6886f0.zip
FreeBSD-src-494d7fa59183a13df1c40639cbb435206f6886f0.tar.gz
Fix some type mismatches.
Reviewed by: pjd@
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c6
-rw-r--r--sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c6
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;
OpenPOWER on IntegriCloud