Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/cddl/osnet/dist enough with the compile time warnings.
details: https://anonhg.NetBSD.org/src/rev/db344a855af0
branches: trunk
changeset: 771421:db344a855af0
user: christos <christos%NetBSD.org@localhost>
date: Sun Nov 20 02:54:25 2011 +0000
description:
enough with the compile time warnings.
diffstat:
external/cddl/osnet/dist/common/acl/acl_common.c | 6 +-
external/cddl/osnet/dist/uts/common/fs/zfs/arc.c | 4 +-
external/cddl/osnet/dist/uts/common/fs/zfs/spa.c | 3 +-
external/cddl/osnet/dist/uts/common/fs/zfs/txg.c | 10 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c | 2 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c | 4 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c | 16 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c | 10 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c | 77 +++++++++++-----
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c | 4 +-
10 files changed, 81 insertions(+), 55 deletions(-)
diffs (truncated from 512 to 300 lines):
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/common/acl/acl_common.c
--- a/external/cddl/osnet/dist/common/acl/acl_common.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/common/acl/acl_common.c Sun Nov 20 02:54:25 2011 +0000
@@ -944,9 +944,9 @@
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;
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Sun Nov 20 02:54:25 2011 +0000
@@ -2095,7 +2095,7 @@
}
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 @@
* heart of the L2ARC.
*/
static void
-l2arc_feed_thread(void)
+l2arc_feed_thread(void *unused __unused)
{
callb_cpr_t cpr;
l2arc_dev_t *dev;
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c Sun Nov 20 02:54:25 2011 +0000
@@ -4776,9 +4776,10 @@
}
static void
-spa_async_thread(spa_t *spa)
+spa_async_thread(void *arg)
{
int tasks;
+ spa_t *spa = arg;
ASSERT(spa->spa_sync_on);
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/txg.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c Sun Nov 20 02:54:25 2011 +0000
@@ -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 @@
}
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 @@
}
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;
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c Sun Nov 20 02:54:25 2011 +0000
@@ -1081,7 +1081,7 @@
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);
}
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sun Nov 20 02:54:25 2011 +0000
@@ -290,9 +290,9 @@
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) {
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Sun Nov 20 02:54:25 2011 +0000
@@ -166,7 +166,7 @@
{
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 @@
* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Sun Nov 20 02:54:25 2011 +0000
@@ -195,12 +195,12 @@
* 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 @@
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.
diff -r 7fe6155603bb -r db344a855af0 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sun Nov 20 01:23:57 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sun Nov 20 02:54:25 2011 +0000
@@ -4776,8 +4776,9 @@
}
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 @@
}
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 @@
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 @@
}
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;
Home |
Main Index |
Thread Index |
Old Index