git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stack dsl_dataset_destroy()
[zfs.git]
/
module
/
zfs
/
spa.c
diff --git
a/module/zfs/spa.c
b/module/zfs/spa.c
index
64f5e06
..
d11f93d
100644
(file)
--- a/
module/zfs/spa.c
+++ b/
module/zfs/spa.c
@@
-271,8
+271,8
@@
spa_prop_get(spa_t *spa, nvlist_t **nvp)
dp = spa_get_dsl(spa);
rw_enter(&dp->dp_config_rwlock, RW_READER);
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;
}
rw_exit(&dp->dp_config_rwlock);
break;
}
@@
-334,7
+334,7
@@
spa_prop_validate(spa_t *spa, nvlist_t *props)
{
nvpair_t *elem;
int error = 0, reset_bootfs = 0;
{
nvpair_t *elem;
int error = 0, reset_bootfs = 0;
- uint64_t objnum;
+ uint64_t objnum
= 0
;
elem = NULL;
while ((elem = nvlist_next_nvpair(props, elem)) != NULL) {
elem = NULL;
while ((elem = nvlist_next_nvpair(props, elem)) != NULL) {
@@
-398,7
+398,7
@@
spa_prop_validate(spa_t *spa, nvlist_t *props)
break;
}
break;
}
- if (
error = dmu_objset_hold(strval, FTAG, &os
))
+ if (
(error = dmu_objset_hold(strval,FTAG,&os)
))
break;
/* Must be ZPL and not gzip compressed. */
break;
/* Must be ZPL and not gzip compressed. */
@@
-1144,7
+1144,7
@@
spa_load_l2cache(spa_t *spa)
uint_t nl2cache;
int i, j, oldnvdevs;
uint64_t guid;
uint_t nl2cache;
int i, j, oldnvdevs;
uint64_t guid;
- vdev_t *vd, **oldvdevs, **newvdevs;
+ vdev_t *vd, **oldvdevs, **newvdevs
= NULL
;
spa_aux_vdev_t *sav = &spa->spa_l2cache;
ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);
spa_aux_vdev_t *sav = &spa->spa_l2cache;
ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);
@@
-2171,7
+2171,7
@@
spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
* to start pushing transactions.
*/
if (state != SPA_LOAD_TRYIMPORT) {
* to start pushing transactions.
*/
if (state != SPA_LOAD_TRYIMPORT) {
- if (
error = spa_load_verify(spa
))
+ if (
(error = spa_load_verify(spa)
))
return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
error));
}
return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
error));
}
@@
-3816,7
+3816,7
@@
int
spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
{
uint64_t txg, dtl_max_txg;
spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
{
uint64_t txg, dtl_max_txg;
- vdev_t *rvd = spa->spa_root_vdev;
+ ASSERTV(vdev_t *rvd = spa->spa_root_vdev;)
vdev_t *oldvd, *newvd, *newrootvd, *pvd, *tvd;
vdev_ops_t *pvops;
char *oldvdpath, *newvdpath;
vdev_t *oldvd, *newvd, *newrootvd, *pvd, *tvd;
vdev_ops_t *pvops;
char *oldvdpath, *newvdpath;
@@
-4016,10
+4016,10
@@
spa_vdev_detach(spa_t *spa, uint64_t guid, uint64_t pguid, int replace_done)
{
uint64_t txg;
int error;
{
uint64_t txg;
int error;
- vdev_t *rvd = spa->spa_root_vdev;
+ ASSERTV(vdev_t *rvd = spa->spa_root_vdev;)
vdev_t *vd, *pvd, *cvd, *tvd;
boolean_t unspare = B_FALSE;
vdev_t *vd, *pvd, *cvd, *tvd;
boolean_t unspare = B_FALSE;
- uint64_t unspare_guid;
+ uint64_t unspare_guid
= 0
;
char *vdpath;
int c, t;
char *vdpath;
int c, t;
@@
-5596,7
+5596,7
@@
spa_sync(spa_t *spa, uint64_t txg)
ddt_sync(spa, txg);
dsl_scan_sync(dp, tx);
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)
vdev_sync(vd, txg);
if (pass == 1)
@@
-5678,7
+5678,7
@@
spa_sync(spa_t *spa, uint64_t txg)
/*
* Update usable space statistics.
*/
/*
* Update usable space statistics.
*/
- while (
vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg
)))
+ while (
(vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg)
)))
vdev_sync_done(vd, txg);
spa_update_dspace(spa);
vdev_sync_done(vd, txg);
spa_update_dspace(spa);