X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_oi.c;h=08aa27f9da8059370080e3693ecf429a1e116d19;hp=d17ae6ff66da8d52b8f34cfc43157c6eab7b9dec;hb=fcd92d64393e0f43f322887fa3d35024c55285e6;hpb=ce8735993473c1055038f7422350c96b092d707d;ds=sidebyside

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index d17ae6f..08aa27f 100644
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -156,7 +156,6 @@ osd_oi_create(const struct lu_env *env, struct osd_device *o,
 	dmu_tx_hold_zap(tx, DMU_NEW_OBJECT, 1, NULL);
 	dmu_tx_hold_bonus(tx, parent);
 	dmu_tx_hold_zap(tx, parent, TRUE, name);
-	LASSERT(tx->tx_objset->os_sa);
 	dmu_tx_hold_sa_create(tx, ZFS_SA_BASE_ATTR_SIZE);
 
 	rc = -dmu_tx_assign(tx, TXG_WAIT);
@@ -519,8 +518,8 @@ osd_oi_remove_table(const struct lu_env *env, struct osd_device *o, int key)
 
 	oi = o->od_oi_table[key];
 	if (oi) {
-		if (oi->oi_db)
-			sa_buf_rele(oi->oi_db, osd_obj_tag);
+		if (oi->oi_dn)
+			osd_dnode_rele(oi->oi_dn);
 		OBD_FREE_PTR(oi);
 		o->od_oi_table[key] = NULL;
 	}
@@ -550,7 +549,7 @@ osd_oi_add_table(const struct lu_env *env, struct osd_device *o,
 	}
 
 	o->od_oi_table[key] = oi;
-	__osd_obj2dbuf(env, o->od_os, oi->oi_zapid, &oi->oi_db);
+	__osd_obj2dnode(env, o->od_os, oi->oi_zapid, &oi->oi_dn);
 
 	return 0;
 }
@@ -886,9 +885,9 @@ int osd_idc_find_and_init(const struct lu_env *env, struct osd_device *osd,
 
 	idc = osd_idc_find(env, osd, fid);
 	if (idc != NULL) {
-		if (obj->oo_db == NULL)
+		if (obj->oo_dn == NULL)
 			return 0;
-		idc->oic_dnode = obj->oo_db->db_object;
+		idc->oic_dnode = obj->oo_dn->dn_object;
 		return 0;
 	}
 
@@ -897,8 +896,8 @@ int osd_idc_find_and_init(const struct lu_env *env, struct osd_device *osd,
 	if (IS_ERR(idc))
 		return PTR_ERR(idc);
 
-	if (obj->oo_db)
-		idc->oic_dnode = obj->oo_db->db_object;
+	if (obj->oo_dn)
+		idc->oic_dnode = obj->oo_dn->dn_object;
 
 	return 0;
 }