Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
This commit is contained in:
commit
cb2016c3a0
|
@ -1024,6 +1024,7 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
|
||||||
* transaction group won't leak out when we sync the older txg.
|
* transaction group won't leak out when we sync the older txg.
|
||||||
*/
|
*/
|
||||||
dr = kmem_zalloc(sizeof (dbuf_dirty_record_t), KM_SLEEP);
|
dr = kmem_zalloc(sizeof (dbuf_dirty_record_t), KM_SLEEP);
|
||||||
|
list_link_init(&dr->dr_dirty_node);
|
||||||
if (db->db_level == 0) {
|
if (db->db_level == 0) {
|
||||||
void *data_old = db->db_buf;
|
void *data_old = db->db_buf;
|
||||||
|
|
||||||
|
|
|
@ -283,6 +283,13 @@ dnode_create(objset_impl_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db,
|
||||||
dn->dn_dbuf = db;
|
dn->dn_dbuf = db;
|
||||||
dn->dn_phys = dnp;
|
dn->dn_phys = dnp;
|
||||||
|
|
||||||
|
list_link_init(&dn->dn_link);
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < TXG_SIZE; i++)
|
||||||
|
list_link_init(&dn->dn_dirty_link[i]);
|
||||||
|
}
|
||||||
|
|
||||||
if (dnp->dn_datablkszsec)
|
if (dnp->dn_datablkszsec)
|
||||||
dnode_setdblksz(dn, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
|
dnode_setdblksz(dn, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
|
||||||
dn->dn_indblkshift = dnp->dn_indblkshift;
|
dn->dn_indblkshift = dnp->dn_indblkshift;
|
||||||
|
|
|
@ -85,9 +85,6 @@ struct dmu_tx;
|
||||||
* etc.
|
* etc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define LIST_LINK_INACTIVE(link) \
|
|
||||||
((link)->list_next == NULL && (link)->list_prev == NULL)
|
|
||||||
|
|
||||||
struct dmu_buf_impl;
|
struct dmu_buf_impl;
|
||||||
|
|
||||||
typedef enum override_states {
|
typedef enum override_states {
|
||||||
|
|
Loading…
Reference in New Issue