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/spa_stats.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/spa_stats.c')
| -rw-r--r-- | module/zfs/spa_stats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/spa_stats.c b/module/zfs/spa_stats.c index 7c97ba105..3e39dba2c 100644 --- a/module/zfs/spa_stats.c +++ b/module/zfs/spa_stats.c @@ -203,7 +203,7 @@ spa_read_history_add(spa_t *spa, const zbookmark_phys_t *zb, uint32_t aflags) if (zfs_read_history_hits == 0 && (aflags & ARC_CACHED)) return; - srh = kmem_zalloc(sizeof (spa_read_history_t), KM_PUSHPAGE); + srh = kmem_zalloc(sizeof (spa_read_history_t), KM_SLEEP); strlcpy(srh->comm, getcomm(), sizeof (srh->comm)); srh->start = gethrtime(); srh->objset = zb->zb_objset; @@ -423,7 +423,7 @@ spa_txg_history_add(spa_t *spa, uint64_t txg, hrtime_t birth_time) if (zfs_txg_history == 0 && ssh->size == 0) return; - sth = kmem_zalloc(sizeof (spa_txg_history_t), KM_PUSHPAGE); + sth = kmem_zalloc(sizeof (spa_txg_history_t), KM_SLEEP); sth->txg = txg; sth->state = TXG_STATE_OPEN; sth->times[TXG_STATE_BIRTH] = birth_time; |