summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-04-23 13:47:49 +0000
committerpjd <pjd@FreeBSD.org>2007-04-23 13:47:49 +0000
commitf32e047ea976283dfadddeb35b401e63ba00cacf (patch)
tree75dbf1060f8155328f77fcbc6348b48e4039b2e4 /sys/cddl
parent62d2d15116b9a8fc154125c71b470ea40916f727 (diff)
downloadFreeBSD-src-f32e047ea976283dfadddeb35b401e63ba00cacf.zip
FreeBSD-src-f32e047ea976283dfadddeb35b401e63ba00cacf.tar.gz
Too much diff reduction. 'cmd' has to be u_long.
Reported by: delphij
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c6
1 files changed, 3 insertions, 3 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 d20fac1..bf1ad2d 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
@@ -188,7 +188,7 @@ zfs_close(vnode_t *vp, int flag, int count, offset_t offset, cred_t *cr)
* 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, u_long cmd, offset_t *off)
{
znode_t *zp = VTOZ(vp);
uint64_t noff = (uint64_t)*off; /* new offset */
@@ -228,7 +228,7 @@ zfs_holey(vnode_t *vp, int cmd, offset_t *off)
/* ARGSUSED */
static int
-zfs_ioctl(vnode_t *vp, int com, intptr_t data, int flag, cred_t *cred,
+zfs_ioctl(vnode_t *vp, u_long com, intptr_t data, int flag, cred_t *cred,
int *rvalp)
{
offset_t off;
@@ -3110,7 +3110,7 @@ zfs_freebsd_ioctl(ap)
} */ *ap;
{
- return (zfs_ioctl(ap->a_vp, (int)ap->a_command, (intptr_t)ap->a_data,
+ return (zfs_ioctl(ap->a_vp, ap->a_command, (intptr_t)ap->a_data,
ap->a_fflag, ap->a_cred, NULL));
}
OpenPOWER on IntegriCloud