svn commit: r185039 - head/cddl/contrib/opensolaris/lib/libzfs/common

Pawel Jakub Dawidek pjd at FreeBSD.org
Mon Nov 17 16:03:38 PST 2008


Author: pjd
Date: Tue Nov 18 00:03:38 2008
New Revision: 185039
URL: http://svn.freebsd.org/changeset/base/185039

Log:
  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

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Tue Nov 18 00:03:30 2008	(r185038)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Tue Nov 18 00:03:38 2008	(r185039)
@@ -319,7 +319,7 @@ extern void zpool_set_history_str(const 
 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

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Tue Nov 18 00:03:30 2008	(r185038)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Tue Nov 18 00:03:38 2008	(r185039)
@@ -758,7 +758,7 @@ zcmd_read_dst_nvlist(libzfs_handle_t *hd
 }
 
 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;
 


More information about the svn-src-head mailing list