X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_fs.c;h=9b61f58d41a2233d0cd50b610ff1d94e04a5fa46;hb=7bf1d7c6cb7d0a7231b3fdcb9e3d3ec3129fb427;hp=182875858a28eacdc9177797babac8dce58b2a9a;hpb=9e9efd99580c8e7d2064d7d1f76041843f8a2036;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c index 1828758..9b61f58 100644 --- a/lustre/ofd/ofd_fs.c +++ b/lustre/ofd/ofd_fs.c @@ -27,7 +27,7 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Whamcloud, Inc. + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -68,30 +68,106 @@ int ofd_record_write(const struct lu_env *env, struct ofd_device *ofd, RETURN(rc); } -obd_id ofd_last_id(struct ofd_device *ofd, obd_seq group) +int ofd_precreate_batch(struct ofd_device *ofd, int batch) { - obd_id id; + int count; + + spin_lock(&ofd->ofd_batch_lock); + count = min(ofd->ofd_precreate_batch, batch); + spin_unlock(&ofd->ofd_batch_lock); + + return count; +} + +struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, obd_seq seq) +{ + struct ofd_seq *oseq; + + read_lock(&ofd->ofd_seq_list_lock); + cfs_list_for_each_entry(oseq, &ofd->ofd_seq_list, os_list) { + if (oseq->os_seq == seq) { + cfs_atomic_inc(&oseq->os_refc); + read_unlock(&ofd->ofd_seq_list_lock); + return oseq; + } + } + read_unlock(&ofd->ofd_seq_list_lock); + return NULL; +} - LASSERT(group <= ofd->ofd_max_group); +static void ofd_seq_destroy(const struct lu_env *env, + struct ofd_seq *oseq) +{ + LASSERT(cfs_list_empty(&oseq->os_list)); + LASSERT(oseq->os_lastid_obj != NULL); + lu_object_put(env, &oseq->os_lastid_obj->do_lu); + OBD_FREE_PTR(oseq); +} + +void ofd_seq_put(const struct lu_env *env, struct ofd_seq *oseq) +{ + if (cfs_atomic_dec_and_test(&oseq->os_refc)) + ofd_seq_destroy(env, oseq); +} + +static void ofd_seq_delete(const struct lu_env *env, struct ofd_seq *oseq) +{ + cfs_list_del_init(&oseq->os_list); + ofd_seq_put(env, oseq); +} + +/** + * Add a new sequence to the OFD device. + * + * \param ofd OFD device + * \param new_seq new sequence to be added + * + * \retval the seq to be added or the existing seq + **/ +static struct ofd_seq *ofd_seq_add(const struct lu_env *env, + struct ofd_device *ofd, + struct ofd_seq *new_seq) +{ + struct ofd_seq *os = NULL; + + write_lock(&ofd->ofd_seq_list_lock); + cfs_list_for_each_entry(os, &ofd->ofd_seq_list, os_list) { + if (os->os_seq == new_seq->os_seq) { + cfs_atomic_inc(&os->os_refc); + write_unlock(&ofd->ofd_seq_list_lock); + /* The seq has not been added to the list */ + ofd_seq_put(env, new_seq); + return os; + } + } + cfs_atomic_inc(&new_seq->os_refc); + cfs_list_add_tail(&new_seq->os_list, &ofd->ofd_seq_list); + ofd->ofd_seq_count++; + write_unlock(&ofd->ofd_seq_list_lock); + return new_seq; +} + +obd_id ofd_seq_last_oid(struct ofd_seq *oseq) +{ + obd_id id; - cfs_spin_lock(&ofd->ofd_objid_lock); - id = ofd->ofd_last_objids[group]; - cfs_spin_unlock(&ofd->ofd_objid_lock); + spin_lock(&oseq->os_last_oid_lock); + id = oseq->os_last_oid; + spin_unlock(&oseq->os_last_oid_lock); return id; } -void ofd_last_id_set(struct ofd_device *ofd, obd_id id, obd_seq group) +void ofd_seq_last_oid_set(struct ofd_seq *oseq, obd_id id) { - LASSERT(group <= ofd->ofd_max_group); - cfs_spin_lock(&ofd->ofd_objid_lock); - if (ofd->ofd_last_objids[group] < id) - ofd->ofd_last_objids[group] = id; - cfs_spin_unlock(&ofd->ofd_objid_lock); + spin_lock(&oseq->os_last_oid_lock); + if (likely(oseq->os_last_oid < id)) + oseq->os_last_oid = id; + spin_unlock(&oseq->os_last_oid_lock); } -int ofd_last_id_write(const struct lu_env *env, struct ofd_device *ofd, - obd_seq group) +int ofd_seq_last_oid_write(const struct lu_env *env, struct ofd_device *ofd, + struct ofd_seq *oseq) { struct ofd_thread_info *info = ofd_info(env); obd_id tmp; @@ -103,72 +179,126 @@ int ofd_last_id_write(const struct lu_env *env, struct ofd_device *ofd, info->fti_buf.lb_len = sizeof(tmp); info->fti_off = 0; - CDEBUG(D_INODE, "%s: write last_objid for group "LPU64": "LPU64"\n", - ofd_obd(ofd)->obd_name, group, ofd_last_id(ofd, group)); + CDEBUG(D_INODE, "%s: write last_objid for seq "LPX64" : "LPX64"\n", + ofd_name(ofd), oseq->os_seq, ofd_seq_last_oid(oseq)); - tmp = cpu_to_le64(ofd_last_id(ofd, group)); + tmp = cpu_to_le64(ofd_seq_last_oid(oseq)); - rc = ofd_record_write(env, ofd, ofd->ofd_lastid_obj[group], - &info->fti_buf, &info->fti_off); + rc = ofd_record_write(env, ofd, oseq->os_lastid_obj, &info->fti_buf, + &info->fti_off); RETURN(rc); } -int ofd_last_group_write(const struct lu_env *env, struct ofd_device *ofd) +static void ofd_deregister_seq_exp(struct ofd_device *ofd) { - struct ofd_thread_info *info = ofd_info(env); - obd_seq tmp; - int rc; + struct seq_server_site *ss = &ofd->ofd_seq_site; - ENTRY; + if (ss->ss_client_seq != NULL) { + lustre_deregister_lwp_item(&ss->ss_client_seq->lcs_exp); + ss->ss_client_seq->lcs_exp = NULL; + } - info->fti_buf.lb_buf = &tmp; - info->fti_buf.lb_len = sizeof(tmp); - info->fti_off = 0; + if (ss->ss_server_fld != NULL) { + lustre_deregister_lwp_item(&ss->ss_server_fld->lsf_control_exp); + ss->ss_server_fld->lsf_control_exp = NULL; + } +} - tmp = cpu_to_le32(ofd->ofd_max_group); +static int ofd_fld_fini(const struct lu_env *env, + struct ofd_device *ofd) +{ + struct seq_server_site *ss = &ofd->ofd_seq_site; + ENTRY; - rc = ofd_record_write(env, ofd, ofd->ofd_last_group_file, - &info->fti_buf, &info->fti_off); + if (ss && ss->ss_server_fld) { + fld_server_fini(env, ss->ss_server_fld); + OBD_FREE_PTR(ss->ss_server_fld); + ss->ss_server_fld = NULL; + } - RETURN(rc); + RETURN(0); } -void ofd_group_fini(const struct lu_env *env, struct ofd_device *ofd, - int group) +void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd) { - LASSERT(ofd->ofd_lastid_obj[group]); - lu_object_put(env, &ofd->ofd_lastid_obj[group]->do_lu); - ofd->ofd_lastid_obj[group] = NULL; + struct ofd_seq *oseq; + struct ofd_seq *tmp; + cfs_list_t dispose; + int rc; + + ofd_deregister_seq_exp(ofd); + + rc = ofd_fid_fini(env, ofd); + if (rc != 0) + CERROR("%s: fid fini error: rc = %d\n", ofd_name(ofd), rc); + + rc = ofd_fld_fini(env, ofd); + if (rc != 0) + CERROR("%s: fld fini error: rc = %d\n", ofd_name(ofd), rc); + + CFS_INIT_LIST_HEAD(&dispose); + write_lock(&ofd->ofd_seq_list_lock); + cfs_list_for_each_entry_safe(oseq, tmp, &ofd->ofd_seq_list, os_list) { + cfs_list_move(&oseq->os_list, &dispose); + } + write_unlock(&ofd->ofd_seq_list_lock); + + while (!cfs_list_empty(&dispose)) { + oseq = container_of0(dispose.next, struct ofd_seq, os_list); + ofd_seq_delete(env, oseq); + } + + LASSERT(cfs_list_empty(&ofd->ofd_seq_list)); + return; } -int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int group) +/** + * + * \retval the seq with seq number or errno (never NULL) + */ +struct ofd_seq *ofd_seq_load(const struct lu_env *env, struct ofd_device *ofd, + obd_seq seq) { struct ofd_thread_info *info = ofd_info(env); + struct ofd_seq *oseq = NULL; struct dt_object *dob; obd_id lastid; int rc; ENTRY; - /* if group is already initialized */ - if (ofd->ofd_lastid_obj[group]) - RETURN(0); + /* if seq is already initialized */ + oseq = ofd_seq_get(ofd, seq); + if (oseq != NULL) + RETURN(oseq); + + OBD_ALLOC_PTR(oseq); + if (oseq == NULL) + RETURN(ERR_PTR(-ENOMEM)); - lu_local_obj_fid(&info->fti_fid, OFD_GROUP0_LAST_OID + group); + lu_last_id_fid(&info->fti_fid, seq); memset(&info->fti_attr, 0, sizeof(info->fti_attr)); info->fti_attr.la_valid = LA_MODE; info->fti_attr.la_mode = S_IFREG | S_IRUGO | S_IWUSR; info->fti_dof.dof_type = dt_mode_to_dft(S_IFREG); - /* create object tracking per-group last created + /* create object tracking per-seq last created * id to be used by orphan recovery mechanism */ dob = dt_find_or_create(env, ofd->ofd_osd, &info->fti_fid, &info->fti_dof, &info->fti_attr); - if (IS_ERR(dob)) - RETURN(PTR_ERR(dob)); + if (IS_ERR(dob)) { + OBD_FREE_PTR(oseq); + RETURN((void *)dob); + } - ofd->ofd_lastid_obj[group] = dob; - cfs_mutex_init(&ofd->ofd_create_locks[group]); + oseq->os_lastid_obj = dob; + + CFS_INIT_LIST_HEAD(&oseq->os_list); + mutex_init(&oseq->os_create_lock); + spin_lock_init(&oseq->os_last_oid_lock); + oseq->os_seq = seq; + + cfs_atomic_set(&oseq->os_refc, 1); rc = dt_attr_get(env, dob, &info->fti_attr, BYPASS_CAPA); if (rc) @@ -176,10 +306,8 @@ int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int group) if (info->fti_attr.la_size == 0) { /* object is just created, initialize last id */ - ofd->ofd_last_objids[group] = OFD_INIT_OBJID; - ofd_last_id_set(ofd, OFD_INIT_OBJID, group); - ofd_last_id_write(env, ofd, group); - ofd_last_group_write(env, ofd); + oseq->os_last_oid = OFD_INIT_OBJID; + ofd_seq_last_oid_write(env, ofd, oseq); } else if (info->fti_attr.la_size == sizeof(lastid)) { info->fti_off = 0; info->fti_buf.lb_buf = &lastid; @@ -187,78 +315,106 @@ int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int group) rc = dt_record_read(env, dob, &info->fti_buf, &info->fti_off); if (rc) { - CERROR("can't read last_id: %d\n", rc); + CERROR("%s: can't read last_id: rc = %d\n", + ofd_name(ofd), rc); GOTO(cleanup, rc); } - ofd->ofd_last_objids[group] = le64_to_cpu(lastid); + oseq->os_last_oid = le64_to_cpu(lastid); } else { - CERROR("corrupted size %Lu LAST_ID of group %u\n", - (unsigned long long)info->fti_attr.la_size, group); - rc = -EINVAL; + CERROR("%s: corrupted size "LPU64" LAST_ID of seq "LPX64"\n", + ofd_name(ofd), (__u64)info->fti_attr.la_size, seq); + GOTO(cleanup, rc = -EINVAL); } - RETURN(0); + oseq = ofd_seq_add(env, ofd, oseq); + RETURN((oseq != NULL) ? oseq : ERR_PTR(-ENOENT)); cleanup: - ofd_group_fini(env, ofd, group); - RETURN(rc); + ofd_seq_put(env, oseq); + return ERR_PTR(rc); } -/* ofd groups managements */ -int ofd_groups_init(const struct lu_env *env, struct ofd_device *ofd) +static int ofd_fld_init(const struct lu_env *env, const char *uuid, + struct ofd_device *ofd) { - struct ofd_thread_info *info = ofd_info(env); - unsigned long groups_size; - obd_seq last_group; - int rc = 0; - int i; - + struct seq_server_site *ss = &ofd->ofd_seq_site; + int rc; ENTRY; - cfs_spin_lock_init(&ofd->ofd_objid_lock); + OBD_ALLOC_PTR(ss->ss_server_fld); + if (ss->ss_server_fld == NULL) + RETURN(rc = -ENOMEM); - rc = dt_attr_get(env, ofd->ofd_last_group_file, - &info->fti_attr, BYPASS_CAPA); - if (rc) - GOTO(cleanup, rc); + rc = fld_server_init(env, ss->ss_server_fld, ofd->ofd_osd, uuid, + ss->ss_node_id, LU_SEQ_RANGE_OST); + if (rc) { + OBD_FREE_PTR(ss->ss_server_fld); + ss->ss_server_fld = NULL; + RETURN(rc); + } + RETURN(0); +} - groups_size = (unsigned long)info->fti_attr.la_size; +static int ofd_register_seq_exp(struct ofd_device *ofd) +{ + struct seq_server_site *ss = &ofd->ofd_seq_site; + char *lwp_name = NULL; + int rc; + + OBD_ALLOC(lwp_name, MAX_OBD_NAME); + if (lwp_name == NULL) + GOTO(out_free, rc = -ENOMEM); + + rc = tgt_name2lwpname(ofd_name(ofd), lwp_name); + if (rc != 0) + GOTO(out_free, rc); + + rc = lustre_register_lwp_item(lwp_name, &ss->ss_client_seq->lcs_exp, + NULL, NULL); + if (rc != 0) + GOTO(out_free, rc); + + rc = lustre_register_lwp_item(lwp_name, + &ss->ss_server_fld->lsf_control_exp, + NULL, NULL); + if (rc != 0) { + lustre_deregister_lwp_item(&ss->ss_client_seq->lcs_exp); + ss->ss_client_seq->lcs_exp = NULL; + GOTO(out_free, rc); + } +out_free: + if (lwp_name != NULL) + OBD_FREE(lwp_name, MAX_OBD_NAME); - if (groups_size == sizeof(last_group)) { - info->fti_off = 0; - info->fti_buf.lb_buf = &last_group; - info->fti_buf.lb_len = sizeof(last_group); + return rc; +} - rc = dt_record_read(env, ofd->ofd_last_group_file, - &info->fti_buf, &info->fti_off); - if (rc) { - CERROR("can't read LAST_GROUP: %d\n", rc); - GOTO(cleanup, rc); - } +/* object sequence management */ +int ofd_seqs_init(const struct lu_env *env, struct ofd_device *ofd) +{ + int rc; - ofd->ofd_max_group = le32_to_cpu(last_group); - LASSERT(ofd->ofd_max_group <= OFD_MAX_GROUPS); - } else if (groups_size == 0) { - ofd->ofd_max_group = 0; - } else { - CERROR("groups file is corrupted? size = %lu\n", groups_size); - GOTO(cleanup, rc = -EIO); + rc = ofd_fid_init(env, ofd); + if (rc != 0) { + CERROR("%s: fid init error: rc = %d\n", ofd_name(ofd), rc); + return rc; } - for (i = 0; i <= ofd->ofd_max_group; i++) { - rc = ofd_group_load(env, ofd, i); - if (rc) { - CERROR("can't load group %d: %d\n", i, rc); - /* Clean all previously set groups */ - while (i > 0) - ofd_group_fini(env, ofd, --i); - GOTO(cleanup, rc); - } + rc = ofd_fld_init(env, ofd_name(ofd), ofd); + if (rc) { + CERROR("%s: Can't init fld, rc %d\n", ofd_name(ofd), rc); + return rc; } - CWARN("%s: %u groups initialized\n", - ofd_obd(ofd)->obd_name, ofd->ofd_max_group + 1); -cleanup: - RETURN(rc); + rc = ofd_register_seq_exp(ofd); + if (rc) { + CERROR("%s: Can't init seq exp, rc %d\n", ofd_name(ofd), rc); + return rc; + } + + rwlock_init(&ofd->ofd_seq_list_lock); + CFS_INIT_LIST_HEAD(&ofd->ofd_seq_list); + ofd->ofd_seq_count = 0; + return rc; } int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd, @@ -287,10 +443,11 @@ int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd, * fsfilt_read_record(), in case sizeof(*lcd) * isn't the same as fsd->lsd_client_size. */ off = lsd->lsd_client_start + cl_idx * lsd->lsd_client_size; - rc = lut_client_data_read(env, &ofd->ofd_lut, lcd, &off, cl_idx); + rc = tgt_client_data_read(env, &ofd->ofd_lut, lcd, &off, cl_idx); if (rc) { - CERROR("error reading FILT %s idx %d off %llu: rc %d\n", - LAST_RCVD, cl_idx, off, rc); + CERROR("%s: error reading FILT %s idx %d off %llu: " + "rc = %d\n", ofd_name(ofd), LAST_RCVD, cl_idx, + off, rc); rc = 0; break; /* read error shouldn't cause startup to fail */ } @@ -315,7 +472,8 @@ int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd, if (IS_ERR(exp)) { if (PTR_ERR(exp) == -EALREADY) { /* export already exists, zero out this one */ - CERROR("Duplicate export %s!\n", lcd->lcd_uuid); + CERROR("%s: Duplicate export %s!\n", + ofd_name(ofd), lcd->lcd_uuid); continue; } GOTO(err_out, rc = PTR_ERR(exp)); @@ -324,14 +482,14 @@ int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd, fed = &exp->exp_filter_data; *fed->fed_ted.ted_lcd = *lcd; - rc = lut_client_add(env, exp, cl_idx); + rc = tgt_client_add(env, exp, cl_idx); LASSERTF(rc == 0, "rc = %d\n", rc); /* can't fail existing */ /* VBR: set export last committed version */ exp->exp_last_committed = last_rcvd; - cfs_spin_lock(&exp->exp_lock); + spin_lock(&exp->exp_lock); exp->exp_connecting = 0; exp->exp_in_recovery = 0; - cfs_spin_unlock(&exp->exp_lock); + spin_unlock(&exp->exp_lock); obd->obd_max_recoverable_clients++; class_export_put(exp); @@ -339,10 +497,10 @@ int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd, CDEBUG(D_OTHER, "client at idx %d has last_rcvd = "LPU64"\n", cl_idx, last_rcvd); - cfs_spin_lock(&ofd->ofd_lut.lut_translock); + spin_lock(&ofd->ofd_lut.lut_translock); if (last_rcvd > lsd->lsd_last_transno) lsd->lsd_last_transno = last_rcvd; - cfs_spin_unlock(&ofd->ofd_lut.lut_translock); + spin_unlock(&ofd->ofd_lut.lut_translock); } err_out: @@ -355,8 +513,9 @@ int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd) struct ofd_thread_info *info = ofd_info(env); struct lr_server_data *lsd = &ofd->ofd_lut.lut_lsd; struct obd_device *obd = ofd_obd(ofd); - unsigned long last_rcvd_size; - int rc; + unsigned long last_rcvd_size; + __u32 index; + int rc; rc = dt_attr_get(env, ofd->ofd_lut.lut_last_rcvd, &info->fti_attr, BYPASS_CAPA); @@ -369,6 +528,13 @@ int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd) CLASSERT (offsetof(struct lr_server_data, lsd_padding) + sizeof(lsd->lsd_padding) == LR_SERVER_SIZE); + rc = server_name2index(obd->obd_name, &index, NULL); + if (rc < 0) { + CERROR("%s: Can not get index from obd_name: rc = %d\n", + obd->obd_name, rc); + RETURN(rc); + } + if (last_rcvd_size == 0) { LCONSOLE_WARN("%s: new disk, initializing\n", obd->obd_name); @@ -381,8 +547,9 @@ int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd) lsd->lsd_client_size = LR_CLIENT_SIZE; lsd->lsd_subdir_count = FILTER_SUBDIR_COUNT; lsd->lsd_feature_incompat = OBD_INCOMPAT_OST; + lsd->lsd_osd_index = index; } else { - rc = lut_server_data_read(env, &ofd->ofd_lut); + rc = tgt_server_data_read(env, &ofd->ofd_lut); if (rc) { CDEBUG(D_INODE,"OBD ofd: error reading %s: rc %d\n", LAST_RCVD, rc); @@ -396,6 +563,17 @@ int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd) obd->obd_uuid.uuid, lsd->lsd_uuid); GOTO(err_fsd, rc = -EINVAL); } + + if (lsd->lsd_osd_index == 0) { + lsd->lsd_osd_index = index; + } else if (lsd->lsd_osd_index != index) { + LCONSOLE_ERROR("%s: index %d in last rcvd is different" + " with the index %d in config log." + " It might be disk corruption!\n", + obd->obd_name, lsd->lsd_osd_index, + index); + GOTO(err_fsd, rc = -EINVAL); + } } lsd->lsd_mount_count++; @@ -439,12 +617,13 @@ int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd) rc = ofd_clients_data_init(env, ofd, last_rcvd_size); - cfs_spin_lock(&ofd->ofd_lut.lut_translock); + spin_lock(&ofd->ofd_lut.lut_translock); obd->obd_last_committed = lsd->lsd_last_transno; - cfs_spin_unlock(&ofd->ofd_lut.lut_translock); + ofd->ofd_lut.lut_last_transno = lsd->lsd_last_transno; + spin_unlock(&ofd->ofd_lut.lut_translock); /* save it, so mount count and last_transno is current */ - rc = lut_server_data_update(env, &ofd->ofd_lut, 0); + rc = tgt_server_data_update(env, &ofd->ofd_lut, 0); if (rc) GOTO(err_fsd, rc); @@ -494,26 +673,11 @@ int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd, ofd->ofd_health_check_file = fo; - lu_local_obj_fid(&info->fti_fid, OFD_LAST_GROUP_OID); - memset(&info->fti_attr, 0, sizeof(info->fti_attr)); - info->fti_attr.la_valid = LA_MODE; - info->fti_attr.la_mode = S_IFREG | S_IRUGO | S_IWUSR; - info->fti_dof.dof_type = dt_mode_to_dft(S_IFREG); - - fo = dt_find_or_create(env, ofd->ofd_osd, &info->fti_fid, - &info->fti_dof, &info->fti_attr); - if (IS_ERR(fo)) - GOTO(out_hc, rc = PTR_ERR(fo)); - - ofd->ofd_last_group_file = fo; - - rc = ofd_groups_init(env, ofd); + rc = ofd_seqs_init(env, ofd); if (rc) - GOTO(out_lg, rc); + GOTO(out_hc, rc); RETURN(0); -out_lg: - lu_object_put(env, &ofd->ofd_last_group_file->do_lu); out_hc: lu_object_put(env, &ofd->ofd_health_check_file->do_lu); out: @@ -529,12 +693,7 @@ void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd) ofd_info_init(env, NULL); - for (i = 0; i <= ofd->ofd_max_group; i++) { - if (ofd->ofd_lastid_obj[i]) { - ofd_last_id_write(env, ofd, i); - ofd_group_fini(env, ofd, i); - } - } + ofd_seqs_fini(env, ofd); i = dt_sync(env, ofd->ofd_osd); if (i) @@ -543,11 +702,6 @@ void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd) /* Remove transaction callback */ dt_txn_callback_del(ofd->ofd_osd, &ofd->ofd_txn_cb); - if (ofd->ofd_last_group_file) { - lu_object_put(env, &ofd->ofd_last_group_file->do_lu); - ofd->ofd_last_group_file = NULL; - } - if (ofd->ofd_health_check_file) { lu_object_put(env, &ofd->ofd_health_check_file->do_lu); ofd->ofd_health_check_file = NULL;