Fix gcc unused variable warnings

[zfs.git] / module / zfs / dsl_dir.c

diff --git a/module/zfs/dsl_dir.c b/module/zfs/dsl_dir.c
index 545dce9..ec1a6bb 100644 (file)
--- a/module/zfs/dsl_dir.c
+++ b/module/zfs/dsl_dir.c
@@ -47,7 +47,7 @@ static void
 dsl_dir_evict(dmu_buf_t *db, void *arg)
 {
        dsl_dir_t *dd = arg;
-       dsl_pool_t *dp = dd->dd_pool;
+       ASSERTV(dsl_pool_t *dp = dd->dd_pool;)
        int t;
 
        for (t = 0; t < TXG_SIZE; t++) {
@@ -881,7 +881,7 @@ dsl_dir_tempreserve_clear(void *tr_cookie, dmu_tx_t *tx)
        if (tr_cookie == NULL)
                return;
 
-       while (tr = list_head(tr_list)) {
+       while ((tr = list_head(tr_list))) {
                if (tr->tr_dp) {
                        dsl_pool_tempreserve_clear(tr->tr_dp, tr->tr_size, tx);
                } else if (tr->tr_ds) {
@@ -1285,8 +1285,8 @@ dsl_dir_rename_check(void *arg1, void *arg2, dmu_tx_t *tx)
                if (closest_common_ancestor(dd, ra->newparent) == dd)
                        return (EINVAL);
 
-               if (err = dsl_dir_transfer_possible(dd->dd_parent,
-                   ra->newparent, myspace))
+               if ((err = dsl_dir_transfer_possible(dd->dd_parent,
+                   ra->newparent, myspace)))
                        return (err);
        }