mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 19:57:43 +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:
@@ -922,7 +922,7 @@ zfs_iput_async(struct inode *ip)
|
||||
|
||||
if (atomic_read(&ip->i_count) == 1)
|
||||
taskq_dispatch(dsl_pool_iput_taskq(dmu_objset_pool(os)),
|
||||
(task_func_t *)iput, ip, TQ_PUSHPAGE);
|
||||
(task_func_t *)iput, ip, TQ_SLEEP);
|
||||
else
|
||||
iput(ip);
|
||||
}
|
||||
@@ -987,7 +987,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
|
||||
return (SET_ERROR(ENOENT));
|
||||
}
|
||||
|
||||
zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_PUSHPAGE);
|
||||
zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_SLEEP);
|
||||
zgd->zgd_zilog = zsb->z_log;
|
||||
zgd->zgd_private = zp;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user