Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve additional cases where gcc wants extra parenthesis. 

These were introduced by the rebase to b108.
This commit is contained in:
Brian Behlendorf 2009-03-11 13:57:47 -07:00
parent ba528721da
commit 3226eea157
12 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/zfs_main.c
View File

@ -645,7 +645,7 @@ zfs_do_create(int argc, char **argv)
zfs_prop_t resv_prop;
char *strval;
if (p = strchr(argv[0], '/'))
if ((p = strchr(argv[0], '/')))
*p = '\0';
zpool_handle = zpool_open(g_zfs, argv[0]);
if (p != NULL)

2
cmd/zpool/zpool_iter.c
View File

@ -131,7 +131,7 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, int *err)
for (i = 0; i < argc; i++) {
zpool_handle_t *zhp;
if (zhp = zpool_open_canfail(g_zfs, argv[i])) {
if ((zhp = zpool_open_canfail(g_zfs, argv[i]))) {
if (add_pool(zhp, zlp) != 0)
*err = B_TRUE;
} else {

4
lib/libzfs/libzfs_dataset.c
View File

@ -632,7 +632,7 @@ libzfs_mnttab_fini(libzfs_handle_t *hdl)
void *cookie = NULL;
mnttab_node_t *mtn;
while (mtn = avl_destroy_nodes(&hdl->libzfs_mnttab_cache, &cookie)) {
while ((mtn = avl_destroy_nodes(&hdl->libzfs_mnttab_cache, &cookie))) {
free(mtn->mtn_mt.mnt_special);
free(mtn->mtn_mt.mnt_mountp);
free(mtn->mtn_mt.mnt_fstype);
@ -684,7 +684,7 @@ libzfs_mnttab_remove(libzfs_handle_t *hdl, const char *fsname)
mnttab_node_t *ret;
find.mtn_mt.mnt_special = (char *)fsname;
if (ret = avl_find(&hdl->libzfs_mnttab_cache, (void *)&find, NULL)) {
if ((ret = avl_find(&hdl->libzfs_mnttab_cache, (void *)&find, NULL))) {
avl_remove(&hdl->libzfs_mnttab_cache, ret);
free(ret->mtn_mt.mnt_special);
free(ret->mtn_mt.mnt_mountp);

5
module/unicode/u8_textprep.c
View File

@ -145,8 +145,9 @@
/* The following are some convenience macros. */
#define U8_PUT_3BYTES_INTO_UTF32(u, b1, b2, b3) \
(u) = ((uint32_t)(b1) & 0x0F) << 12 | ((uint32_t)(b2) & 0x3F) << 6 | \
(uint32_t)(b3) & 0x3F;
(u) = ((((uint32_t)(b1) & 0x0F) << 12) | \
(((uint32_t)(b2) & 0x3F) << 6) | \
((uint32_t)(b3) & 0x3F));
#define U8_SIMPLE_SWAP(a, b, t) \
(t) = (a); \

2
module/zfs/dnode.c
View File

@ -1106,7 +1106,7 @@ dnode_free_range(dnode_t *dn, uint64_t off, uint64_t len, dmu_tx_t *tx)
int shift = epbs + dn->dn_datablkshift;
first = blkid >> epbs;
if (db = dbuf_hold_level(dn, 1, first, FTAG)) {
if ((db = dbuf_hold_level(dn, 1, first, FTAG))) {
dbuf_will_dirty(db, tx);
dbuf_rele(db, FTAG);
}

2
module/zfs/dnode_sync.c
View File

@ -581,7 +581,7 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
mutex_exit(&dn->dn_mtx);
/* process all the "freed" ranges in the file */
while (rp = avl_last(&dn->dn_ranges[txgoff])) {
while ((rp = avl_last(&dn->dn_ranges[txgoff]))) {
dnode_sync_free_range(dn, rp->fr_blkid, rp->fr_nblks, tx);
/* grab the mutex so we don't race with dnode_block_freed() */
mutex_enter(&dn->dn_mtx);

4
module/zfs/dsl_dataset.c
View File

@ -2333,8 +2333,8 @@ dsl_dataset_promote_check(void *arg1, void *arg2, dmu_tx_t *tx)
if (ds->ds_phys->ds_prev_snap_obj == 0)
continue;
if (err = bplist_space(&ds->ds_deadlist,
&dlused, &dlcomp, &dluncomp))
if ((err = bplist_space(&ds->ds_deadlist,
&dlused, &dlcomp, &dluncomp)))
return (err);
pa->used += dlused;
pa->comp += dlcomp;

4
module/zfs/dsl_pool.c
View File

@ -312,12 +312,12 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
ASSERT(err == 0);
DTRACE_PROBE(pool_sync__2rootzio);
while (dstg = txg_list_remove(&dp->dp_sync_tasks, txg))
while ((dstg = txg_list_remove(&dp->dp_sync_tasks, txg)))
dsl_sync_task_group_sync(dstg, tx);
DTRACE_PROBE(pool_sync__3task);
start = gethrtime();
while (dd = txg_list_remove(&dp->dp_dirty_dirs, txg))
while ((dd = txg_list_remove(&dp->dp_dirty_dirs, txg)))
dsl_dir_sync(dd, tx);
write_time += gethrtime() - start;

14
module/zfs/spa.c
View File

@ -215,8 +215,8 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
dp = spa_get_dsl(spa);
rw_enter(&dp->dp_config_rwlock, RW_READER);
if (err = dsl_dataset_hold_obj(dp,
za.za_first_integer, FTAG, &ds)) {
if ((err = dsl_dataset_hold_obj(dp,
za.za_first_integer, FTAG, &ds))) {
rw_exit(&dp->dp_config_rwlock);
break;
}
@ -336,8 +336,8 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
break;
}
if (error = dmu_objset_open(strval, DMU_OST_ZFS,
DS_MODE_USER | DS_MODE_READONLY, &os))
if ((error = dmu_objset_open(strval,DMU_OST_ZFS,
DS_MODE_USER | DS_MODE_READONLY, &os)))
break;
/* We don't support gzip bootable datasets */
@ -2362,7 +2362,7 @@ spa_check_rootconf(char *devpath, char *devid, nvlist_t **bestconf,
uint64_t txg;
int error;
if (error = vdev_disk_read_rootlabel(devpath, devid, &config))
if ((error = vdev_disk_read_rootlabel(devpath, devid, &config)))
return (error);
VERIFY(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_TXG, &txg) == 0);
@ -2408,7 +2408,7 @@ spa_get_rootconf(char *devpath, char *devid, nvlist_t **bestconf)
if (devpath && ((tmp = strchr(devpath, ' ')) != NULL))
*tmp = '\0';
if (error = spa_check_rootconf(devpath, devid, &conf, &txg)) {
if ((error = spa_check_rootconf(devpath, devid, &conf, &txg))) {
cmn_err(CE_NOTE, "error reading device label");
return (error);
}
@ -2492,7 +2492,7 @@ spa_import_rootpool(char *devpath, char *devid)
* Get the vdev pathname and configuation from the most
* recently updated vdev (highest txg).
*/
if (error = spa_get_rootconf(devpath, devid, &conf))
if ((error = spa_get_rootconf(devpath, devid, &conf)))
goto msg_out;
/*

4
module/zfs/zfs_fuid.c
View File

@ -161,12 +161,12 @@ zfs_fuid_table_destroy(avl_tree_t *idx_tree, avl_tree_t *domain_tree)
void *cookie;
cookie = NULL;
while (domnode = avl_destroy_nodes(domain_tree, &cookie))
while ((domnode = avl_destroy_nodes(domain_tree, &cookie)))
ksiddomain_rele(domnode->f_ksid);
avl_destroy(domain_tree);
cookie = NULL;
while (domnode = avl_destroy_nodes(idx_tree, &cookie))
while ((domnode = avl_destroy_nodes(idx_tree, &cookie)))
kmem_free(domnode, sizeof (fuid_domain_t));
avl_destroy(idx_tree);
}

22
module/zfs/zfs_ioctl.c
View File

@ -748,8 +748,8 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
nvlist_t *zplprops = NULL;
char *buf;
if (error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
&config))
if ((error = get_nvlist(zc->zc_nvlist_conf,
zc->zc_nvlist_conf_size, &config)))
return (error);
if (zc->zc_nvlist_src_size != 0 && (error =
@ -1020,7 +1020,7 @@ zfs_ioc_dsobj_to_dsname(zfs_cmd_t *zc)
{
int error;
if (error = dsl_dsobj_to_dsname(zc->zc_name, zc->zc_obj, zc->zc_value))
if ((error = dsl_dsobj_to_dsname(zc->zc_name,zc->zc_obj,zc->zc_value)))
return (error);
return (0);
@ -1203,8 +1203,8 @@ zfs_ioc_objset_stats(zfs_cmd_t *zc)
int error;
nvlist_t *nv;
if (error = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os))
if ((error = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os)))
return (error);
dmu_objset_fast_stat(os, &zc->zc_objset_stats);
@ -1261,8 +1261,8 @@ zfs_ioc_objset_zplprops(zfs_cmd_t *zc)
objset_t *os;
int err;
if (err = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os))
if ((err = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os)))
return (err);
dmu_objset_fast_stat(os, &zc->zc_objset_stats);
@ -1310,8 +1310,8 @@ zfs_ioc_dataset_list_next(zfs_cmd_t *zc)
int error;
char *p;
if (error = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os)) {
if ((error = dmu_objset_open(zc->zc_name,
DMU_OST_ANY, DS_MODE_USER | DS_MODE_READONLY, &os))) {
if (error == ENOENT)
error = ESRCH;
return (error);
@ -1425,8 +1425,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
nvpair_type(elem) != DATA_TYPE_STRING)
return (EINVAL);
if (error = zfs_secpolicy_write_perms(name,
ZFS_DELEG_PERM_USERPROP, CRED()))
if ((error = zfs_secpolicy_write_perms(name,
ZFS_DELEG_PERM_USERPROP, CRED())))
return (error);
continue;
}

3
module/zfs/zio.c
View File

@ -2194,11 +2194,12 @@ zio_done(zio_t *zio)
*/
ASSERT(vd == NULL && bp != NULL);
if (IO_IS_ALLOCATING(zio))
if (IO_IS_ALLOCATING(zio)) {
if (zio->io_error != ENOSPC)
zio->io_reexecute |= ZIO_REEXECUTE_NOW;
else
zio->io_reexecute |= ZIO_REEXECUTE_SUSPEND;
}
if ((zio->io_type == ZIO_TYPE_READ ||
zio->io_type == ZIO_TYPE_FREE) &&