d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch KM_SLEEP to KM_PUSHPAGE

Browse Source 
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 <behlendorf1@llnl.gov>
Closes #1268
This commit is contained in:
Ned Bass 2013-02-06 10:15:13 -08:00 committed by Brian Behlendorf
parent 02a946ce10
commit ed2e157605
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/dmu_objset.c
View File

@ -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;
/*

4
module/zfs/dsl_dir.c
View File

@ -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;