Skip to content

Commit

Permalink
Switch KM_SLEEP to KM_PUSHPAGE
Browse files Browse the repository at this point in the history
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 openzfs#1268
  • Loading branch information
nedbass authored and unya committed Dec 13, 2013
1 parent 063ce6c commit c03ba0d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion module/zfs/dmu_objset.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/dsl_dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit c03ba0d

Please sign in to comment.