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
Add linux kernel memory support
[zfs.git]
/
module
/
zfs
/
zap_micro.c
diff --git
a/module/zfs/zap_micro.c
b/module/zfs/zap_micro.c
index
aa86bde
..
04369bb
100644
(file)
--- a/
module/zfs/zap_micro.c
+++ b/
module/zfs/zap_micro.c
@@
-532,7
+532,7
@@
mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
sz = zap->zap_dbuf->db_size;
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
sz = zap->zap_dbuf->db_size;
- mzp =
k
mem_alloc(sz, KM_SLEEP);
+ mzp =
v
mem_alloc(sz, KM_SLEEP);
bcopy(zap->zap_dbuf->db_data, mzp, sz);
nchunks = zap->zap_m.zap_num_chunks;
bcopy(zap->zap_dbuf->db_data, mzp, sz);
nchunks = zap->zap_m.zap_num_chunks;
@@
-540,7
+540,7
@@
mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object,
1ULL << fzap_default_block_shift, 0, tx);
if (err) {
err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object,
1ULL << fzap_default_block_shift, 0, tx);
if (err) {
-
k
mem_free(mzp, sz);
+
v
mem_free(mzp, sz);
return (err);
}
}
return (err);
}
}
@@
-566,7
+566,7
@@
mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
if (err)
break;
}
if (err)
break;
}
-
k
mem_free(mzp, sz);
+
v
mem_free(mzp, sz);
*zapp = zap;
return (err);
}
*zapp = zap;
return (err);
}