diff options
author | pjd <pjd@FreeBSD.org> | 2008-11-18 00:03:38 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2008-11-18 00:03:38 +0000 |
commit | eb404aafac60161295f48d1e2a9dbc228cd8922c (patch) | |
tree | d4c6e3d9e58743d39379f8dbe33bd503f66f77e0 | |
parent | a439cdd8d408dfb0b2c406486aa8c13b9ef61770 (diff) | |
download | FreeBSD-src-eb404aafac60161295f48d1e2a9dbc228cd8922c.zip FreeBSD-src-eb404aafac60161295f48d1e2a9dbc228cd8922c.tar.gz |
Fix a warning on amd64 caused by using int for request argument instead of
unsigned long:
WARNING pid 12888 (zfs/zpool): ioctl sign-extension ioctl ffffffffcc285aXX
Reported by: kris
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h | 2 | ||||
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h index 71aab1c..4e8efb4 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h @@ -319,7 +319,7 @@ extern void zpool_set_history_str(const char *subcommand, int argc, extern int zpool_stage_history(libzfs_handle_t *, const char *); extern void zpool_obj_to_path(zpool_handle_t *, uint64_t, uint64_t, char *, size_t len); -extern int zfs_ioctl(libzfs_handle_t *, int, struct zfs_cmd *); +extern int zfs_ioctl(libzfs_handle_t *, unsigned long, struct zfs_cmd *); extern int zpool_get_physpath(zpool_handle_t *, char *); /* * Basic handle manipulations. These functions do not create or destroy the diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c index 9d60d60..859630a 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c @@ -758,7 +758,7 @@ zcmd_read_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, nvlist_t **nvlp) } int -zfs_ioctl(libzfs_handle_t *hdl, int request, zfs_cmd_t *zc) +zfs_ioctl(libzfs_handle_t *hdl, unsigned long request, zfs_cmd_t *zc) { int error; |