diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-07 16:09:12 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-07 16:09:12 -0700 |
| commit | 19f57f1ae4fb802388c64df33b6d57ddf7139563 (patch) | |
| tree | 709105731df493218f48045aba64d4ecad7003b5 | |
| parent | 33e5b3832fa48661f3507aa0fd6b90ea9cf2e315 (diff) | |
| parent | 55b864f19b66a284bbbc1c3c7972491d4488d051 (diff) | |
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
| -rw-r--r-- | module/zfs/dmu_objset.c | 2 | ||||
| -rw-r--r-- | module/zfs/dsl_prop.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index ddcc6fdc5..d1cd9d530 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -1044,7 +1044,7 @@ dmu_objset_do_userquota_callbacks(objset_impl_t *os, dmu_tx_t *tx) ASSERT(list_head(list) == NULL || dmu_objset_userused_enabled(os)); - while (dn = list_head(list)) { + while ((dn = list_head(list))) { dmu_object_type_t bonustype; ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object)); diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c index 9bc122674..c26c3ff27 100644 --- a/module/zfs/dsl_prop.c +++ b/module/zfs/dsl_prop.c @@ -510,7 +510,7 @@ dsl_props_set(const char *dsname, nvlist_t *nvl) nvpair_t *elem = NULL; int err; - if (err = dsl_dataset_hold(dsname, FTAG, &ds)) + if ((err = dsl_dataset_hold(dsname, FTAG, &ds))) return (err); /* * Do these checks before the syncfunc, since it can't fail. |