diff options
| author | Brian Behlendorf <[email protected]> | 2009-03-11 14:08:49 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-03-11 14:08:49 -0700 |
| commit | b757e756975f92ad903c65903accad245cb2c9de (patch) | |
| tree | a6b9d5d9d534a7697625b25046505166b4c4794a /lib/libzfs | |
| parent | c1d30c2fd3da0bfaf5a23c7e1f1f52e50d61418d (diff) | |
| parent | e5011401cd4ef761bc6557c44dd11c77f2010581 (diff) | |
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Diffstat (limited to 'lib/libzfs')
| -rw-r--r-- | lib/libzfs/libzfs_dataset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index 066586974..2978c9a34 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -636,7 +636,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); @@ -688,7 +688,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); |