git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clear PG_writeback for sync I/O error case
[zfs.git]
/
module
/
zfs
/
zap.c
diff --git
a/module/zfs/zap.c
b/module/zfs/zap.c
index
288a4d9
..
fac54ea
100644
(file)
--- a/
module/zfs/zap.c
+++ b/
module/zfs/zap.c
@@
-114,7
+114,7
@@
fzap_upgrade(zap_t *zap, dmu_tx_t *tx, zap_flags_t flags)
1<<FZAP_BLOCK_SHIFT(zap), FTAG, &db, DMU_READ_NO_PREFETCH));
dmu_buf_will_dirty(db, tx);
1<<FZAP_BLOCK_SHIFT(zap), FTAG, &db, DMU_READ_NO_PREFETCH));
dmu_buf_will_dirty(db, tx);
- l = kmem_zalloc(sizeof (zap_leaf_t), KM_
SLEEP
);
+ l = kmem_zalloc(sizeof (zap_leaf_t), KM_
PUSHPAGE
);
l->l_dbuf = db;
l->l_phys = db->db_data;
l->l_dbuf = db;
l->l_phys = db->db_data;
@@
-390,11
+390,11
@@
static zap_leaf_t *
zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
{
void *winner;
zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
{
void *winner;
- zap_leaf_t *l = kmem_alloc(sizeof (zap_leaf_t), KM_
SLEEP
);
+ zap_leaf_t *l = kmem_alloc(sizeof (zap_leaf_t), KM_
PUSHPAGE
);
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
- rw_init(&l->l_rwlock,
0, 0, 0
);
+ rw_init(&l->l_rwlock,
NULL, RW_DEFAULT, NULL
);
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = zap_allocate_blocks(zap, 1);
l->l_dbuf = NULL;
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = zap_allocate_blocks(zap, 1);
l->l_dbuf = NULL;
@@
-452,8
+452,8
@@
zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
ASSERT(blkid != 0);
ASSERT(blkid != 0);
- l = kmem_alloc(sizeof (zap_leaf_t), KM_
SLEEP
);
- rw_init(&l->l_rwlock,
0, 0, 0
);
+ l = kmem_alloc(sizeof (zap_leaf_t), KM_
PUSHPAGE
);
+ rw_init(&l->l_rwlock,
NULL, RW_DEFAULT, NULL
);
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = blkid;
l->l_bs = highbit(db->db_size)-1;
rw_enter(&l->l_rwlock, RW_WRITER);
l->l_blkid = blkid;
l->l_bs = highbit(db->db_size)-1;
@@
-483,7
+483,7
@@
zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
ASSERT3U(ZAP_LEAF_HASH_NUMENTRIES(l), >, ZAP_LEAF_NUMCHUNKS(l) / 3);
/* The chunks should begin at the end of the hash table */
ASSERT3U(ZAP_LEAF_HASH_NUMENTRIES(l), >, ZAP_LEAF_NUMCHUNKS(l) / 3);
/* The chunks should begin at the end of the hash table */
- ASSERT3P(&ZAP_LEAF_CHUNK(l, 0), ==,
+ ASSERT3P(&ZAP_LEAF_CHUNK(l, 0), ==,
(zap_leaf_chunk_t *)
&l->l_phys->l_hash[ZAP_LEAF_HASH_NUMENTRIES(l)]);
/* The chunks should end at the end of the block */
&l->l_phys->l_hash[ZAP_LEAF_HASH_NUMENTRIES(l)]);
/* The chunks should end at the end of the block */
@@
-957,7
+957,7
@@
zap_value_search(objset_t *os, uint64_t zapobj, uint64_t value, uint64_t mask,
if (mask == 0)
mask = -1ULL;
if (mask == 0)
mask = -1ULL;
- za = kmem_alloc(sizeof (zap_attribute_t), KM_
SLEEP
);
+ za = kmem_alloc(sizeof (zap_attribute_t), KM_
PUSHPAGE
);
for (zap_cursor_init(&zc, os, zapobj);
(err = zap_cursor_retrieve(&zc, za)) == 0;
zap_cursor_advance(&zc)) {
for (zap_cursor_init(&zc, os, zapobj);
(err = zap_cursor_retrieve(&zc, za)) == 0;
zap_cursor_advance(&zc)) {