]> granicus.if.org Git - zfs/commitdiff
Update gcc-no-parenthesis
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:16:41 +0000 (15:16 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:16:41 +0000 (15:16 -0700)
Fix new locations of missing parenthesis according to gcc.

lib/libzfs/libzfs_sendrecv.c
module/zfs/bplist.c
module/zfs/dmu_send.c
module/zfs/dmu_tx.c
module/zfs/dmu_zfetch.c
module/zfs/sa.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c

index 672e004ef5cd9086e76d8d6b64c4d5cc45eabd68..05b84bdb106211fd03ae782a4a5b506b6516dd3f 100644 (file)
@@ -1235,7 +1235,7 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
        if (flags.dedup) {
                featureflags |= (DMU_BACKUP_FEATURE_DEDUP |
                    DMU_BACKUP_FEATURE_DEDUPPROPS);
-               if (err = pipe(pipefd)) {
+               if ((err = pipe(pipefd))) {
                        zfs_error_aux(zhp->zfs_hdl, strerror(errno));
                        return (zfs_error(zhp->zfs_hdl, EZFS_PIPEFAILED,
                            errbuf));
@@ -1243,7 +1243,7 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
                dda.outputfd = outfd;
                dda.inputfd = pipefd[1];
                dda.dedup_hdl = zhp->zfs_hdl;
-               if (err = pthread_create(&tid, NULL, cksummer, &dda)) {
+               if ((err = pthread_create(&tid, NULL, cksummer, &dda))) {
                        (void) close(pipefd[0]);
                        (void) close(pipefd[1]);
                        zfs_error_aux(zhp->zfs_hdl, strerror(errno));
index 066ccc6b1e052e5bdefc99fa252d1bca55b5c178..5d1cf7e7631296cc8bf00db25690b45e208c865b 100644 (file)
@@ -58,7 +58,7 @@ bplist_iterate(bplist_t *bpl, bplist_itor_t *func, void *arg, dmu_tx_t *tx)
        bplist_entry_t *bpe;
 
        mutex_enter(&bpl->bpl_lock);
-       while (bpe = list_head(&bpl->bpl_list)) {
+       while ((bpe = list_head(&bpl->bpl_list))) {
                list_remove(&bpl->bpl_list, bpe);
                mutex_exit(&bpl->bpl_lock);
                func(arg, &bpe->bpe_blk, tx);
index 6b00b73b43be124143e7582da4ba1edcefb04f1b..c26d0a3fb680083a38096fc34ed8abbb43d70582 100644 (file)
@@ -1183,8 +1183,9 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
                ref_os = os;
        }
 
-       if (err = dmu_buf_hold(ref_os, drrwbr->drr_refobject,
-           drrwbr->drr_refoffset, FTAG, &dbp, DMU_READ_PREFETCH))
+       err = dmu_buf_hold(ref_os, drrwbr->drr_refobject,
+           drrwbr->drr_refoffset, FTAG, &dbp, DMU_READ_PREFETCH);
+       if (err)
                return (err);
 
        tx = dmu_tx_create(os);
@@ -1441,7 +1442,7 @@ out:
        if (featureflags & DMU_BACKUP_FEATURE_DEDUP) {
                void *cookie = NULL;
 
-               while (gmep = avl_destroy_nodes(&ra.guid_to_ds_map, &cookie)) {
+               while ((gmep = avl_destroy_nodes(&ra.guid_to_ds_map, &cookie))) {
                        dsl_dataset_rele(gmep->gme_ds, &ra.guid_to_ds_map);
                        kmem_free(gmep, sizeof (guid_map_entry_t));
                }
index 4378539c793387f97f023f89c9a6753d5166af59..33fc93f3f55a6be2634373510d63ba11a4d441c7 100644 (file)
@@ -1217,7 +1217,7 @@ dmu_tx_do_callbacks(list_t *cb_list, int error)
 {
        dmu_tx_callback_t *dcb;
 
-       while (dcb = list_head(cb_list)) {
+       while ((dcb = list_head(cb_list))) {
                list_remove(cb_list, dcb);
                dcb->dcb_func(dcb->dcb_data, error);
                kmem_free(dcb, sizeof (dmu_tx_callback_t));
index 37037c30f62354359befc3f6896665158ba6ef74..4a1b1f4a7f4fc9b21595366ac703d0ebbeb16d51 100644 (file)
@@ -665,7 +665,7 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset, uint64_t size, int prefetched)
                ZFETCHSTAT_BUMP(zfetchstat_hits);
        } else {
                ZFETCHSTAT_BUMP(zfetchstat_misses);
-               if (fetched = dmu_zfetch_colinear(zf, &zst)) {
+               if ((fetched = dmu_zfetch_colinear(zf, &zst))) {
                        ZFETCHSTAT_BUMP(zfetchstat_colinear_hits);
                } else {
                        ZFETCHSTAT_BUMP(zfetchstat_colinear_misses);
index a91b379f998455ec4291e8928aa8dcb68933c7d6..d65c28f27359832abbc96454944c270b78d4b73c 100644 (file)
@@ -1020,16 +1020,16 @@ sa_tear_down(objset_t *os)
            sizeof (sa_attr_table_t) * sa->sa_num_attrs);
 
        cookie = NULL;
-       while (layout = avl_destroy_nodes(&sa->sa_layout_hash_tree, &cookie)) {
+       while ((layout = avl_destroy_nodes(&sa->sa_layout_hash_tree, &cookie))){
                sa_idx_tab_t *tab;
-               while (tab = list_head(&layout->lot_idx_tab)) {
+               while ((tab = list_head(&layout->lot_idx_tab))) {
                        ASSERT(refcount_count(&tab->sa_refcount));
                        sa_idx_tab_rele(os, tab);
                }
        }
 
        cookie = NULL;
-       while (layout = avl_destroy_nodes(&sa->sa_layout_num_tree, &cookie)) {
+       while ((layout = avl_destroy_nodes(&sa->sa_layout_num_tree, &cookie))){
                kmem_free(layout->lot_attrs,
                    sizeof (sa_attr_type_t) * layout->lot_attr_count);
                kmem_free(layout, sizeof (sa_lot_t));
@@ -1302,7 +1302,7 @@ sa_handle_get(objset_t *objset, uint64_t objid, void *userp,
        dmu_buf_t *db;
        int error;
 
-       if (error = dmu_bonus_hold(objset, objid, NULL, &db))
+       if ((error = dmu_bonus_hold(objset, objid, NULL, &db)))
                return (error);
 
        return (sa_handle_get_from_db(objset, db, userp, hdl_type,
index 63d4a0f9c218baf59e9ac6c8a3451ad65bcf3523..8ba6ecbeb0ff0cc0ddf2abf748707c1189ecdd53 100644 (file)
@@ -5349,7 +5349,7 @@ spa_sync(spa_t *spa, uint64_t txg)
                ddt_sync(spa, txg);
                dsl_scan_sync(dp, tx);
 
-               while (vd = txg_list_remove(&spa->spa_vdev_txg_list, txg))
+               while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, txg)))
                        vdev_sync(vd, txg);
 
                if (pass == 1)
index 6032705565299918c5886bf56a769a9b659e5ada..a6e2eb982189be85979d9f7d5eae782770b04181 100644 (file)
@@ -1519,8 +1519,8 @@ zfs_ioc_vdev_split(zfs_cmd_t *zc)
        if ((error = spa_open(zc->zc_name, &spa, FTAG)) != 0)
                return (error);
 
-       if (error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
-           zc->zc_iflags, &config)) {
+       if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
+           zc->zc_iflags, &config))) {
                spa_close(spa, FTAG);
                return (error);
        }
@@ -1635,13 +1635,13 @@ zfs_ioc_objset_stats(zfs_cmd_t *zc)
  * local property values.
  */
 static int
-zfs_ioc_objset_recvd_props(zfs_cmd_t *zc)
+zfs_ioc_objset_recvd_props(struct file *filp, zfs_cmd_t *zc)
 {
        objset_t *os = NULL;
        int error;
        nvlist_t *nv;
 
-       if (error = dmu_objset_hold(zc->zc_name, FTAG, &os))
+       if ((error = dmu_objset_hold(zc->zc_name, FTAG, &os)))
                return (error);
 
        /*
@@ -2366,8 +2366,8 @@ zfs_ioc_pool_set_props(zfs_cmd_t *zc)
        int error;
        nvpair_t *pair;
 
-       if (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
-           zc->zc_iflags, &props))
+       if ((error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
+           zc->zc_iflags, &props)))
                return (error);
 
        /*
@@ -3088,8 +3088,8 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr)
 
        if (prop == ZPROP_INVAL) {
                if (zfs_prop_user(propname)) {
-                       if (err = zfs_secpolicy_write_perms(dsname,
-                           ZFS_DELEG_PERM_USERPROP, cr))
+                       if ((err = zfs_secpolicy_write_perms(dsname,
+                           ZFS_DELEG_PERM_USERPROP, cr)))
                                return (err);
                        return (0);
                }
@@ -3112,7 +3112,7 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr)
                                return (EINVAL);
                        }
 
-                       if (err = zfs_secpolicy_write_perms(dsname, perm, cr))
+                       if ((err = zfs_secpolicy_write_perms(dsname, perm, cr)))
                                return (err);
                        return (0);
                }