Module Name: src
Committed By: christos
Date: Sun Nov 20 02:54:25 UTC 2011
Modified Files:
src/external/cddl/osnet/dist/common/acl: acl_common.c
src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c spa.c txg.c
vdev.c vdev_disk.c zfs_ioctl.c zfs_vfsops.c zfs_vnops.c zfs_znode.c
Log Message:
enough with the compile time warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/common/acl/acl_common.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/common/acl/acl_common.c
diff -u src/external/cddl/osnet/dist/common/acl/acl_common.c:1.4 src/external/cddl/osnet/dist/common/acl/acl_common.c:1.5
--- src/external/cddl/osnet/dist/common/acl/acl_common.c:1.4 Mon Mar 14 20:48:04 2011
+++ src/external/cddl/osnet/dist/common/acl/acl_common.c Sat Nov 19 21:54:25 2011
@@ -944,9 +944,9 @@ acevals_init(acevals_t *vals, uid_t key)
static void
ace_list_init(ace_list_t *al, int dfacl_flag)
{
- acevals_init(&al->user_obj, NULL);
- acevals_init(&al->group_obj, NULL);
- acevals_init(&al->other_obj, NULL);
+ acevals_init(&al->user_obj, 0);
+ acevals_init(&al->group_obj, 0);
+ acevals_init(&al->other_obj, 0);
al->numusers = 0;
al->numgroups = 0;
al->acl_mask = 0;
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.10
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.9 Thu May 6 18:35:37 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Sat Nov 19 21:54:25 2011
@@ -2095,7 +2095,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
}
static void
-arc_reclaim_thread(void)
+arc_reclaim_thread(void *unused __unused)
{
clock_t growtime = 0;
arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS;
@@ -4473,7 +4473,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_de
* heart of the L2ARC.
*/
static void
-l2arc_feed_thread(void)
+l2arc_feed_thread(void *unused __unused)
{
callb_cpr_t cpr;
l2arc_dev_t *dev;
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.4 Mon May 10 02:15:28 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c Sat Nov 19 21:54:25 2011
@@ -4776,9 +4776,10 @@ spa_async_autoexpand(spa_t *spa, vdev_t
}
static void
-spa_async_thread(spa_t *spa)
+spa_async_thread(void *arg)
{
int tasks;
+ spa_t *spa = arg;
ASSERT(spa->spa_sync_on);
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.4 Thu Jun 24 09:03:05 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sat Nov 19 21:54:25 2011
@@ -290,9 +290,9 @@ vdev_disk_io_start(zio_t *zio)
bp->b_private = zio;
if (!(bp->b_flags & B_READ)) {
- mutex_enter(&vp->v_interlock);
+ mutex_enter(vp->v_interlock);
vp->v_numoutput++;
- mutex_exit(&vp->v_interlock);
+ mutex_exit(vp->v_interlock);
}
if (bp->b_bcount <= MAXPHYS) {
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c:1.3 Sat Feb 27 18:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c Sat Nov 19 21:54:25 2011
@@ -34,8 +34,8 @@
* Pool-wide transaction groups.
*/
-static void txg_sync_thread(dsl_pool_t *dp);
-static void txg_quiesce_thread(dsl_pool_t *dp);
+static void txg_sync_thread(void *);
+static void txg_quiesce_thread(void *);
int zfs_txg_timeout = 30; /* max seconds worth of delta per txg */
@@ -350,8 +350,9 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
}
static void
-txg_sync_thread(dsl_pool_t *dp)
+txg_sync_thread(void *arg)
{
+ dsl_pool_t *dp = arg;
spa_t *spa = dp->dp_spa;
tx_state_t *tx = &dp->dp_tx;
callb_cpr_t cpr;
@@ -428,8 +429,9 @@ txg_sync_thread(dsl_pool_t *dp)
}
static void
-txg_quiesce_thread(dsl_pool_t *dp)
+txg_quiesce_thread(void *arg)
{
+ dsl_pool_t *dp = arg;
tx_state_t *tx = &dp->dp_tx;
callb_cpr_t cpr;
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.3 Sat Feb 27 18:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c Sat Nov 19 21:54:25 2011
@@ -1081,7 +1081,7 @@ vdev_open_children(vdev_t *vd)
for (int c = 0; c < children; c++)
VERIFY(taskq_dispatch(tq, vdev_open_child, vd->vdev_child[c],
- TQ_SLEEP) != NULL);
+ TQ_SLEEP) != 0);
taskq_destroy(tq);
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.7 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.8
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.7 Fri Jan 21 08:08:42 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Sat Nov 19 21:54:25 2011
@@ -166,7 +166,7 @@ history_str_get(zfs_cmd_t *zc)
{
char *buf;
- if (zc->zc_history == NULL)
+ if (zc->zc_history == 0)
return (NULL);
buf = kmem_alloc(HIS_MAX_RECORD_LEN, KM_SLEEP);
@@ -1726,7 +1726,7 @@ zfs_ioc_objset_zplprops(zfs_cmd_t *zc)
* which we aren't supposed to do with a DS_MODE_USER
* hold, because it could be inconsistent.
*/
- if (zc->zc_nvlist_dst != NULL &&
+ if (zc->zc_nvlist_dst != 0 &&
!zc->zc_objset_stats.dds_inconsistent &&
dmu_objset_type(os) == DMU_OST_ZFS) {
nvlist_t *nv;
@@ -2288,7 +2288,7 @@ zfs_ioc_set_prop(zfs_cmd_t *zc)
error = zfs_set_prop_nvlist(zc->zc_name, source, nvl, &errors);
- if (zc->zc_nvlist_dst != NULL && errors != NULL) {
+ if (zc->zc_nvlist_dst != 0 && errors != 0) {
(void) put_nvlist(zc, errors);
}
@@ -2439,7 +2439,7 @@ zfs_ioc_pool_get_props(zfs_cmd_t *zc)
spa_close(spa, FTAG);
}
- if (error == 0 && zc->zc_nvlist_dst != NULL)
+ if (error == 0 && zc->zc_nvlist_dst != 0)
error = put_nvlist(zc, nvp);
else
error = EFAULT;
@@ -2776,7 +2776,7 @@ zfs_ioc_create(zfs_cmd_t *zc)
strchr(zc->zc_name, '%'))
return (EINVAL);
- if (zc->zc_nvlist_src != NULL &&
+ if (zc->zc_nvlist_src != 0 &&
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
zc->zc_iflags, &nvprops)) != 0)
return (error);
@@ -2900,7 +2900,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc)
if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
return (EINVAL);
- if (zc->zc_nvlist_src != NULL &&
+ if (zc->zc_nvlist_src != 0 &&
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
zc->zc_iflags, &nvprops)) != 0)
return (error);
@@ -3426,7 +3426,7 @@ zfs_ioc_recv(zfs_cmd_t *zc)
tosnap = strchr(tofs, '@');
*tosnap++ = '\0';
- if (zc->zc_nvlist_src != NULL &&
+ if (zc->zc_nvlist_src != 0 &&
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
zc->zc_iflags, &props)) != 0)
return (error);
@@ -3762,7 +3762,7 @@ zfs_ioc_clear(zfs_cmd_t *zc)
nvlist_t *policy;
nvlist_t *config = NULL;
- if (zc->zc_nvlist_src == NULL)
+ if (zc->zc_nvlist_src == 0)
return (EINVAL);
if ((error = get_nvlist(zc->zc_nvlist_src,
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.7
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.6 Fri Oct 7 05:35:04 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Sat Nov 19 21:54:25 2011
@@ -195,12 +195,12 @@ loop:
* Skip the vnode/inode if inaccessible, or if the
* atime is clean.
*/
- mutex_enter(&vp->v_interlock);
+ mutex_enter(vp->v_interlock);
zp = VTOZ(vp);
if (zp == NULL || vp->v_type == VNON ||
(vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0 ||
zp->z_atime_dirty == 0 || zp->z_unlinked) {
- mutex_exit(&vp->v_interlock);
+ mutex_exit(vp->v_interlock);
continue;
}
vmark(mvp, vp);
@@ -1624,14 +1624,14 @@ zfs_mount(vfs_t *vfsp, const char *path,
if (mvp->v_type != VDIR)
return (ENOTDIR);
- mutex_enter(&mvp->v_interlock);
+ mutex_enter(mvp->v_interlock);
if ((uap->flags & MS_REMOUNT) == 0 &&
(uap->flags & MS_OVERLAY) == 0 &&
(mvp->v_count != 1 || (mvp->v_flag & VROOT))) {
- mutex_exit(&mvp->v_interlock);
+ mutex_exit(mvp->v_interlock);
return (EBUSY);
}
- mutex_exit(&mvp->v_interlock);
+ mutex_exit(mvp->v_interlock);
/*
* ZFS does not support passing unparsed data in via MS_DATA.
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.9
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.8 Sun Jan 2 00:12:03 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sat Nov 19 21:54:25 2011
@@ -4776,8 +4776,9 @@ zfs_pathconf(vnode_t *vp, int cmd, ulong
}
static int
-zfs_netbsd_open(struct vop_open_args *ap)
+zfs_netbsd_open(void *v)
{
+ struct vop_open_args *ap = v;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
int error;
@@ -4788,15 +4789,17 @@ zfs_netbsd_open(struct vop_open_args *ap
}
static int
-zfs_netbsd_close(struct vop_close_args *ap)
+zfs_netbsd_close(void *v)
{
+ struct vop_close_args *ap = v;
return (zfs_close(ap->a_vp, ap->a_fflag, 0, 0, ap->a_cred, NULL));
}
static int
-zfs_netbsd_ioctl(struct vop_ioctl_args *ap)
+zfs_netbsd_ioctl(void *v)
{
+ struct vop_ioctl_args *ap = v;
return (zfs_ioctl(ap->a_vp, ap->a_command, (intptr_t)ap->a_data,
ap->a_fflag, ap->a_cred, NULL, NULL));
@@ -4804,22 +4807,25 @@ zfs_netbsd_ioctl(struct vop_ioctl_args *
static int
-zfs_netbsd_read(struct vop_read_args *ap)
+zfs_netbsd_read(void *v)
{
+ struct vop_read_args *ap = v;
return (zfs_read(ap->a_vp, ap->a_uio, ap->a_ioflag, ap->a_cred, NULL));
}
static int
-zfs_netbsd_write(struct vop_write_args *ap)
+zfs_netbsd_write(void *v)
{
+ struct vop_write_args *ap = v;
return (zfs_write(ap->a_vp, ap->a_uio, ap->a_ioflag, ap->a_cred, NULL));
}
static int
-zfs_netbsd_access(struct vop_access_args *ap)
+zfs_netbsd_access(void *v)
{
+ struct vop_access_args *ap = v;
/*
* ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest
@@ -4838,8 +4844,9 @@ zfs_netbsd_access(struct vop_access_args
}
static int
-zfs_netbsd_lookup(struct vop_lookup_args *ap)
+zfs_netbsd_lookup(void *v)
{
+ struct vop_lookup_args *ap = v;
struct componentname *cnp = ap->a_cnp;
char nm[NAME_MAX + 1];
int err;
@@ -4854,8 +4861,9 @@ zfs_netbsd_lookup(struct vop_lookup_args
}
static int
-zfs_netbsd_create(struct vop_create_args *ap)
+zfs_netbsd_create(void *v)
{
+ struct vop_create_args *ap = v;
struct componentname *cnp = ap->a_cnp;
vattr_t *vap = ap->a_vap;
int mode;
@@ -4868,16 +4876,18 @@ zfs_netbsd_create(struct vop_create_args
}
static int
-zfs_netbsd_remove(struct vop_remove_args *ap)
+zfs_netbsd_remove(void *v)
{
+ struct vop_remove_args *ap = v;
return (zfs_remove(ap->a_dvp, (char *)ap->a_cnp->cn_nameptr,
ap->a_cnp->cn_cred, NULL, 0));
}
static int
-zfs_netbsd_mkdir(struct vop_mkdir_args *ap)
+zfs_netbsd_mkdir(void *v)
{
+ struct vop_mkdir_args *ap = v;
vattr_t *vap = ap->a_vap;
vattr_init_mask(vap);
@@ -4887,31 +4897,35 @@ zfs_netbsd_mkdir(struct vop_mkdir_args *
}
static int
-zfs_netbsd_rmdir(struct vop_rmdir_args *ap)
+zfs_netbsd_rmdir(void *v)
{
+ struct vop_rmdir_args *ap = v;
struct componentname *cnp = ap->a_cnp;
return (zfs_rmdir(ap->a_dvp, (char *)cnp->cn_nameptr, NULL, cnp->cn_cred, NULL, 0));
}
static int
-zfs_netbsd_readdir(struct vop_readdir_args *ap)
+zfs_netbsd_readdir(void *v)
{
+ struct vop_readdir_args *ap = v;
return (zfs_readdir(ap->a_vp, ap->a_uio, ap->a_cred, ap->a_eofflag,
ap->a_ncookies, (u_long **)ap->a_cookies));
}
static int
-zfs_netbsd_fsync(struct vop_fsync_args *ap)
+zfs_netbsd_fsync(void *v)
{
+ struct vop_fsync_args *ap = v;
return (zfs_fsync(ap->a_vp, ap->a_flags, ap->a_cred, NULL));
}
static int
-zfs_netbsd_getattr(struct vop_getattr_args *ap)
+zfs_netbsd_getattr(void *v)
{
+ struct vop_getattr_args *ap = v;
vattr_t *vap = ap->a_vap;
xvattr_t xvap;
u_long fflags = 0;
@@ -4951,8 +4965,9 @@ zfs_netbsd_getattr(struct vop_getattr_ar
}
static int
-zfs_netbsd_setattr(struct vop_setattr_args *ap)
+zfs_netbsd_setattr(void *v)
{
+ struct vop_setattr_args *ap = v;
vnode_t *vp = ap->a_vp;
vattr_t *vap = ap->a_vap;
cred_t *cred = ap->a_cred;
@@ -5026,7 +5041,8 @@ zfs_netbsd_setattr(struct vop_setattr_ar
}
static int
-zfs_netbsd_rename(ap)
+zfs_netbsd_rename(void *v)
+{
struct vop_rename_args /* {
struct vnode *a_fdvp;
struct vnode *a_fvp;
@@ -5034,8 +5050,7 @@ zfs_netbsd_rename(ap)
struct vnode *a_tdvp;
struct vnode *a_tvp;
struct componentname *a_tcnp;
- } */ *ap;
-{
+ } */ *ap = v;
vnode_t *fdvp = ap->a_fdvp;
vnode_t *fvp = ap->a_fvp;
vnode_t *tdvp = ap->a_tdvp;
@@ -5058,8 +5073,9 @@ zfs_netbsd_rename(ap)
}
static int
-zfs_netbsd_symlink(struct vop_symlink_args *ap)
+zfs_netbsd_symlink(void *v)
{
+ struct vop_symlink_args *ap = v;
struct componentname *cnp = ap->a_cnp;
vattr_t *vap = ap->a_vap;
@@ -5237,23 +5253,26 @@ static int zfs_isdir();
#endif
static int
-zfs_netbsd_readlink(struct vop_readlink_args *ap)
+zfs_netbsd_readlink(void *v)
{
+ struct vop_readlink_args *ap = v;
return (zfs_readlink(ap->a_vp, ap->a_uio, ap->a_cred, NULL));
}
static int
-zfs_netbsd_link(struct vop_link_args *ap)
+zfs_netbsd_link(void *v)
{
+ struct vop_link_args *ap = v;
struct componentname *cnp = ap->a_cnp;
return (zfs_link(ap->a_dvp, ap->a_vp, (char *)cnp->cn_nameptr, cnp->cn_cred, NULL, 0));
}
static int
-zfs_netbsd_inactive(struct vop_inactive_args *ap)
+zfs_netbsd_inactive(void *v)
{
+ struct vop_inactive_args *ap = v;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
@@ -5271,7 +5290,7 @@ zfs_netbsd_inactive(struct vop_inactive_
* Destroy znode from taskq thread without ZFS_OBJ_MUTEX held.
*/
static void
-zfs_reclaim_deferred(void *arg, int pending)
+zfs_reclaim_deferred(void *arg)
{
znode_t *zp = arg;
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
@@ -5288,8 +5307,9 @@ zfs_reclaim_deferred(void *arg, int pend
}
static int
-zfs_netbsd_reclaim(struct vop_reclaim_args *ap)
+zfs_netbsd_reclaim(void *v)
{
+ struct vop_reclaim_args *ap = v;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
zfsvfs_t *zfsvfs;
@@ -5354,15 +5374,17 @@ zfs_netbsd_reclaim(struct vop_reclaim_ar
}
static int
-zfs_netbsd_fid(struct vop_fid_args *ap)
+zfs_netbsd_fid(void *v)
{
+ struct vop_fid_args *ap = v;
return (zfs_fid(ap->a_vp, (void *)ap->a_fid, NULL));
}
static int
-zfs_netbsd_pathconf(struct vop_pathconf_args *ap)
+zfs_netbsd_pathconf(void *v)
{
+ struct vop_pathconf_args *ap = v;
ulong_t val;
int error;
@@ -5404,8 +5426,9 @@ zfs_netbsd_pathconf(struct vop_pathconf_
}
int
-zfs_netbsd_lock(struct vop_lock_args *ap)
+zfs_netbsd_lock(void *v)
{
+ struct vop_lock_args *ap = v;
return 0;
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.11 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.12
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.11 Sun Jun 12 10:47:20 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Sat Nov 19 21:54:25 2011
@@ -951,11 +951,11 @@ again:
err = ENOENT;
} else {
if ((vp = ZTOV(zp)) != NULL) {
- mutex_enter(&vp->v_interlock);
+ mutex_enter(vp->v_interlock);
mutex_exit(&zp->z_lock);
if (vget(vp, 0) != 0) {
dmu_buf_rele(db, NULL);
- mutex_exit(&vp->v_interlock);
+ mutex_exit(vp->v_interlock);
goto again;
}
mutex_enter(&zp->z_lock);
