aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/dsl_userhold.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-11-05 10:32:39 -0800
committerBrian Behlendorf <[email protected]>2013-11-05 12:26:14 -0800
commit2517c8ee08ef21ba112c00a94070302cdca04a58 (patch)
tree012af4b6f66046a54d450ebbdba67b5a244b0f30 /module/zfs/dsl_userhold.c
parent1ca546b33888b8f4c7e737faf8f038732926fd6e (diff)
Switch allocations from KM_SLEEP to KM_PUSHPAGE
A couple of kmem_alloc() allocations were using KM_SLEEP in the sync thread context. These were accidentally introduced by the recent set of Illumos patches. The solution is to switch to KM_PUSHPAGE. dsl_dataset_promote_sync() -> promote_hold() -> snaplist_make() -> kmem_alloc(sizeof (*snap), KM_SLEEP); dsl_dataset_user_hold_sync() -> dsl_onexit_hold_cleanup() -> kmem_alloc(sizeof (*ca), KM_SLEEP) Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #1775
Diffstat (limited to 'module/zfs/dsl_userhold.c')
-rw-r--r--module/zfs/dsl_userhold.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dsl_userhold.c b/module/zfs/dsl_userhold.c
index db9540d13..6f0470477 100644
--- a/module/zfs/dsl_userhold.c
+++ b/module/zfs/dsl_userhold.c
@@ -225,7 +225,7 @@ dsl_onexit_hold_cleanup(spa_t *spa, nvlist_t *holds, minor_t minor)
}
ASSERT(spa != NULL);
- ca = kmem_alloc(sizeof (*ca), KM_SLEEP);
+ ca = kmem_alloc(sizeof (*ca), KM_PUSHPAGE);
(void) strlcpy(ca->zhca_spaname, spa_name(spa),
sizeof (ca->zhca_spaname));