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
Add zstreamdump .gitignore
[zfs.git]
/
module
/
zfs
/
vdev.c
diff --git
a/module/zfs/vdev.c
b/module/zfs/vdev.c
index
0c8ce1b
..
06c7d0c
100644
(file)
--- a/
module/zfs/vdev.c
+++ b/
module/zfs/vdev.c
@@
-195,7
+195,7
@@
vdev_add_child(vdev_t *pvd, vdev_t *cvd)
pvd->vdev_children = MAX(pvd->vdev_children, id + 1);
newsize = pvd->vdev_children * sizeof (vdev_t *);
pvd->vdev_children = MAX(pvd->vdev_children, id + 1);
newsize = pvd->vdev_children * sizeof (vdev_t *);
- newchild = kmem_zalloc(newsize, KM_
SLEEP
);
+ newchild = kmem_zalloc(newsize, KM_
PUSHPAGE
);
if (pvd->vdev_child != NULL) {
bcopy(pvd->vdev_child, newchild, oldsize);
kmem_free(pvd->vdev_child, oldsize);
if (pvd->vdev_child != NULL) {
bcopy(pvd->vdev_child, newchild, oldsize);
kmem_free(pvd->vdev_child, oldsize);
@@
-265,7
+265,7
@@
vdev_compact_children(vdev_t *pvd)
if (pvd->vdev_child[c])
newc++;
if (pvd->vdev_child[c])
newc++;
- newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_
SLEEP
);
+ newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_
PUSHPAGE
);
for (c = newc = 0; c < oldc; c++) {
if ((cvd = pvd->vdev_child[c]) != NULL) {
for (c = newc = 0; c < oldc; c++) {
if ((cvd = pvd->vdev_child[c]) != NULL) {
@@
-288,7
+288,7
@@
vdev_alloc_common(spa_t *spa, uint_t id, uint64_t guid, vdev_ops_t *ops)
vdev_t *vd;
int t;
vdev_t *vd;
int t;
- vd = kmem_zalloc(sizeof (vdev_t), KM_
SLEEP
);
+ vd = kmem_zalloc(sizeof (vdev_t), KM_
PUSHPAGE
);
if (spa->spa_root_vdev == NULL) {
ASSERT(ops == &vdev_root_ops);
if (spa->spa_root_vdev == NULL) {
ASSERT(ops == &vdev_root_ops);
@@
-838,7
+838,7
@@
vdev_metaslab_init(vdev_t *vd, uint64_t txg)
ASSERT(oldc <= newc);
ASSERT(oldc <= newc);
- mspp = kmem_zalloc(newc * sizeof (*mspp), KM_
SLEEP
| KM_NODEBUG);
+ mspp = kmem_zalloc(newc * sizeof (*mspp), KM_
PUSHPAGE
| KM_NODEBUG);
if (oldc != 0) {
bcopy(vd->vdev_ms, mspp, oldc * sizeof (*mspp));
if (oldc != 0) {
bcopy(vd->vdev_ms, mspp, oldc * sizeof (*mspp));
@@
-993,7
+993,7
@@
vdev_probe(vdev_t *vd, zio_t *zio)
mutex_enter(&vd->vdev_probe_lock);
if ((pio = vd->vdev_probe_zio) == NULL) {
mutex_enter(&vd->vdev_probe_lock);
if ((pio = vd->vdev_probe_zio) == NULL) {
- vps = kmem_zalloc(sizeof (*vps), KM_
SLEEP
);
+ vps = kmem_zalloc(sizeof (*vps), KM_
PUSHPAGE
);
vps->vps_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_PROBE |
ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_AGGREGATE |
vps->vps_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_PROBE |
ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_AGGREGATE |