LU-8928 osd: convert osd-zfs to reference dnode, not db

[fs/lustre-release.git] / lustre / osd-zfs / osd_oi.c

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index d17ae6f..08aa27f 100644 (file)
--- 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);
        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);
        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) {
 
        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;
        }
                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;
        }
 
        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;
 }
 
        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) {
 
        idc = osd_idc_find(env, osd, fid);
        if (idc != NULL) {

-               if (obj->oo_db == NULL)
+               if (obj->oo_dn == NULL)

                        return 0;
                        return 0;

-               idc->oic_dnode = obj->oo_db->db_object;
+               idc->oic_dnode = obj->oo_dn->dn_object;

                return 0;
        }
 
                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 (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;
 }
 
        return 0;
 }