mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 19:28:53 +03:00
Change KM_PUSHPAGE -> KM_SLEEP
By marking DMU transaction processing contexts with PF_FSTRANS we can revert the KM_PUSHPAGE -> KM_SLEEP changes. This brings us back in line with upstream. In some cases this means simply swapping the flags back. For others fnvlist_alloc() was replaced by nvlist_alloc(..., KM_PUSHPAGE) and must be reverted back to fnvlist_alloc() which assumes KM_SLEEP. The one place KM_PUSHPAGE is kept is when allocating ARC buffers which allows us to dip in to reserved memory. This is again the same as upstream. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
+3
-3
@@ -426,7 +426,7 @@ zfs_zevent_alloc(void)
|
||||
{
|
||||
zevent_t *ev;
|
||||
|
||||
ev = kmem_zalloc(sizeof (zevent_t), KM_PUSHPAGE);
|
||||
ev = kmem_zalloc(sizeof (zevent_t), KM_SLEEP);
|
||||
if (ev == NULL)
|
||||
return (NULL);
|
||||
|
||||
@@ -776,7 +776,7 @@ zfs_zevent_destroy(zfs_zevent_t *ze)
|
||||
static void *
|
||||
i_fm_alloc(nv_alloc_t *nva, size_t size)
|
||||
{
|
||||
return (kmem_zalloc(size, KM_PUSHPAGE));
|
||||
return (kmem_zalloc(size, KM_SLEEP));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
@@ -844,7 +844,7 @@ fm_nvlist_create(nv_alloc_t *nva)
|
||||
nv_alloc_t *nvhdl;
|
||||
|
||||
if (nva == NULL) {
|
||||
nvhdl = kmem_zalloc(sizeof (nv_alloc_t), KM_PUSHPAGE);
|
||||
nvhdl = kmem_zalloc(sizeof (nv_alloc_t), KM_SLEEP);
|
||||
|
||||
if (nv_alloc_init(nvhdl, &fm_mem_alloc_ops, NULL, 0) != 0) {
|
||||
kmem_free(nvhdl, sizeof (nv_alloc_t));
|
||||
|
||||
Reference in New Issue
Block a user