diff options
| author | Brian Behlendorf <[email protected]> | 2014-11-20 19:09:39 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-01-16 14:41:26 -0800 |
| commit | 79c76d5b65b19a602d4c7a340da7bf90d4a0c4f8 (patch) | |
| tree | 4a8b04dd1657e396d4a04f72364d9157dec0b178 /module/zfs/zfs_onexit.c | |
| parent | efcd79a883caddea4a20bfc771da31ecc6ce4ca2 (diff) | |
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 <[email protected]>
Diffstat (limited to 'module/zfs/zfs_onexit.c')
| -rw-r--r-- | module/zfs/zfs_onexit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zfs_onexit.c b/module/zfs/zfs_onexit.c index 2b286e71f..18a0671a8 100644 --- a/module/zfs/zfs_onexit.c +++ b/module/zfs/zfs_onexit.c @@ -156,7 +156,7 @@ zfs_onexit_add_cb(minor_t minor, void (*func)(void *), void *data, if (error) return (error); - ap = kmem_alloc(sizeof (zfs_onexit_action_node_t), KM_PUSHPAGE); + ap = kmem_alloc(sizeof (zfs_onexit_action_node_t), KM_SLEEP); list_link_init(&ap->za_link); ap->za_func = func; ap->za_data = data; |