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
kmem_zalloc(..., KM_SLEEP) will never fail
[zfs.git]
/
module
/
zfs
/
vdev.c
diff --git
a/module/zfs/vdev.c
b/module/zfs/vdev.c
index
15ff30f
..
d6b55ee
100644
(file)
--- a/
module/zfs/vdev.c
+++ b/
module/zfs/vdev.c
@@
-61,9
+61,6
@@
static vdev_ops_t *vdev_ops_table[] = {
NULL
};
NULL
};
-/* maximum scrub/resilver I/O queue per leaf vdev */
-int zfs_scrub_limit = 10;
-
/*
* Given a vdev type, return the appropriate ops vector.
*/
/*
* Given a vdev type, return the appropriate ops vector.
*/
@@
-601,9
+598,9
@@
vdev_free(vdev_t *vd)
metaslab_group_destroy(vd->vdev_mg);
}
metaslab_group_destroy(vd->vdev_mg);
}
- ASSERT
3U(vd->vdev_stat.vs_space, ==, 0
);
- ASSERT
3U(vd->vdev_stat.vs_dspace, ==, 0
);
- ASSERT
3U(vd->vdev_stat.vs_alloc, ==, 0
);
+ ASSERT
0(vd->vdev_stat.vs_space
);
+ ASSERT
0(vd->vdev_stat.vs_dspace
);
+ ASSERT
0(vd->vdev_stat.vs_alloc
);
/*
* Remove this vdev from its parent's child list.
/*
* Remove this vdev from its parent's child list.
@@
-1828,7
+1825,7
@@
vdev_dtl_sync(vdev_t *vd, uint64_t txg)
if (vd->vdev_detached) {
if (smo->smo_object != 0) {
if (vd->vdev_detached) {
if (smo->smo_object != 0) {
- VERIFY
(0 ==
dmu_object_free(mos, smo->smo_object, tx));
+ VERIFY
0(
dmu_object_free(mos, smo->smo_object, tx));
smo->smo_object = 0;
}
dmu_tx_commit(tx);
smo->smo_object = 0;
}
dmu_tx_commit(tx);
@@
-1858,6
+1855,7
@@
vdev_dtl_sync(vdev_t *vd, uint64_t txg)
space_map_truncate(smo, mos, tx);
space_map_sync(&smsync, SM_ALLOC, smo, mos, tx);
space_map_truncate(smo, mos, tx);
space_map_sync(&smsync, SM_ALLOC, smo, mos, tx);
+ space_map_vacate(&smsync, NULL, NULL);
space_map_destroy(&smsync);
space_map_destroy(&smsync);
@@
-2032,7
+2030,7
@@
vdev_remove(vdev_t *vd, uint64_t txg)
tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);
if (vd->vdev_dtl_smo.smo_object) {
tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);
if (vd->vdev_dtl_smo.smo_object) {
- ASSERT
3U(vd->vdev_dtl_smo.smo_alloc, ==, 0
);
+ ASSERT
0(vd->vdev_dtl_smo.smo_alloc
);
(void) dmu_object_free(mos, vd->vdev_dtl_smo.smo_object, tx);
vd->vdev_dtl_smo.smo_object = 0;
}
(void) dmu_object_free(mos, vd->vdev_dtl_smo.smo_object, tx);
vd->vdev_dtl_smo.smo_object = 0;
}
@@
-2044,7
+2042,7
@@
vdev_remove(vdev_t *vd, uint64_t txg)
if (msp == NULL || msp->ms_smo.smo_object == 0)
continue;
if (msp == NULL || msp->ms_smo.smo_object == 0)
continue;
- ASSERT
3U(msp->ms_smo.smo_alloc, ==, 0
);
+ ASSERT
0(msp->ms_smo.smo_alloc
);
(void) dmu_object_free(mos, msp->ms_smo.smo_object, tx);
msp->ms_smo.smo_object = 0;
}
(void) dmu_object_free(mos, msp->ms_smo.smo_object, tx);
msp->ms_smo.smo_object = 0;
}
@@
-2322,7
+2320,7
@@
top:
(void) spa_vdev_state_exit(spa, vd, 0);
goto top;
}
(void) spa_vdev_state_exit(spa, vd, 0);
goto top;
}
- ASSERT
3U(tvd->vdev_stat.vs_alloc, ==, 0
);
+ ASSERT
0(tvd->vdev_stat.vs_alloc
);
}
/*
}
/*
@@
-3241,7
+3239,4
@@
EXPORT_SYMBOL(vdev_degrade);
EXPORT_SYMBOL(vdev_online);
EXPORT_SYMBOL(vdev_offline);
EXPORT_SYMBOL(vdev_clear);
EXPORT_SYMBOL(vdev_online);
EXPORT_SYMBOL(vdev_offline);
EXPORT_SYMBOL(vdev_clear);
-
-module_param(zfs_scrub_limit, int, 0644);
-MODULE_PARM_DESC(zfs_scrub_limit, "Max scrub/resilver I/O per leaf vdev");
#endif
#endif