LU-6747 osd-zfs: initialize obd_statfs in osd_statfs()

[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 00dfa14..22f6ff0 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -94,6 +94,7 @@ static const struct named_oid oids[] = {
        { OFD_HEALTH_CHECK_OID,         HEALTH_CHECK },
        { ACCT_USER_OID,                "acct_usr_inode" },
        { ACCT_GROUP_OID,               "acct_grp_inode" },
+       { REPLY_DATA_OID,               REPLY_DATA },
        { 0,                            NULL }
 };
 
@@ -689,8 +690,7 @@ static char *root2convert = "ROOT";
  * This is only needed for pre-production 2.4 ZFS filesystems, and
  * can be removed in the future.
  */
-int osd_convert_root_to_new_seq(const struct lu_env *env,
-                                       struct osd_device *o)
+int osd_convert_root_to_new_seq(const struct lu_env *env, struct osd_device *o)
 {
        struct luz_direntry *lze = &osd_oti_get(env)->oti_zde;
        char                *buf = osd_oti_get(env)->oti_str;
@@ -735,7 +735,7 @@ int osd_convert_root_to_new_seq(const struct lu_env *env,
 
        /* declare that we'll add object to fid-dnode mapping */
        newfid.f_seq = FID_SEQ_ROOT;
-       newfid.f_oid = 1;
+       newfid.f_oid = FID_OID_ROOT;
        newfid.f_ver = 0;
        zapid = osd_get_name_n_idx(env, o, &newfid, buf);
        dmu_tx_hold_bonus(tx, zapid);