diff options
| author | Ned Bass <[email protected]> | 2013-02-06 10:15:13 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-02-06 11:19:58 -0800 |
| commit | ed2e157605ba0bbce954174e49c6a76682d564b9 (patch) | |
| tree | 06f5e54a764a7be7de1e20aa1abd4a634348a4a7 | |
| parent | 02a946ce10671478e3394180b84f3af4de48c59d (diff) | |
Switch KM_SLEEP to KM_PUSHPAGE
Two more locations where KM_SLEEP was used in a call which must
use KM_PUSHPAGE were found while using the zpool upgrade command.
See commit b8d06fc for additional details.
Also make a small correction to the comment block above
dsl_dir_open_spa().
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1268
| -rw-r--r-- | module/zfs/dmu_objset.c | 2 | ||||
| -rw-r--r-- | module/zfs/dsl_dir.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index c59973a77..50673dc97 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -1672,7 +1672,7 @@ dmu_objset_find_spa(spa_t *spa, const char *name, } thisobj = dd->dd_phys->dd_head_dataset_obj; - attr = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP); + attr = kmem_alloc(sizeof (zap_attribute_t), KM_PUSHPAGE); dp = dd->dd_pool; /* diff --git a/module/zfs/dsl_dir.c b/module/zfs/dsl_dir.c index 741223984..a25ebbfaa 100644 --- a/module/zfs/dsl_dir.c +++ b/module/zfs/dsl_dir.c @@ -295,7 +295,7 @@ getcomponent(const char *path, char *component, const char **nextp) } /* - * same as dsl_open_dir, ignore the first component of name and use the + * same as dsl_dir_open, ignore the first component of name and use the * spa instead */ int @@ -312,7 +312,7 @@ dsl_dir_open_spa(spa_t *spa, const char *name, void *tag, dprintf("%s\n", name); - buf = kmem_alloc(MAXNAMELEN, KM_SLEEP); + buf = kmem_alloc(MAXNAMELEN, KM_PUSHPAGE); err = getcomponent(name, buf, &next); if (err) goto error; |