X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_scrub.c;h=0302222faa4a53979a6d2b8fa625ddb8bd4d2f23;hp=fdfab11a8b042bdaf1124130abd3e513dea63e5c;hb=1e42682aeadb0f80dd6e9bfd45abe17221b698bf;hpb=2d3d4525b1ac6697b5df207400801c4399d20378;ds=sidebyside diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c index fdfab11..0302222 100644 --- a/lustre/osd-ldiskfs/osd_scrub.c +++ b/lustre/osd-ldiskfs/osd_scrub.c @@ -20,7 +20,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * lustre/osd-ldiskfs/osd_scrub.c @@ -37,6 +37,7 @@ #define DEBUG_SUBSYSTEM S_LFSCK +#include #include #include #include @@ -97,7 +98,7 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, const struct lu_fid *fid, const struct osd_inode_id *id, int ops, bool force, - enum oi_check_flags flags) + enum oi_check_flags flags, bool *exist) { handle_t *th; int rc; @@ -114,7 +115,8 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, rc = PTR_ERR(th); CDEBUG(D_LFSCK, "%s: fail to start trans for scrub op %d " DFID" => %u/%u: rc = %d\n", osd_name(dev), ops, - PFID(fid), id->oii_ino, id->oii_gen, rc); + PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1, + rc); RETURN(rc); } @@ -127,7 +129,7 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, } break; case DTO_INDEX_INSERT: - rc = osd_oi_insert(info, dev, fid, id, th, flags); + rc = osd_oi_insert(info, dev, fid, id, th, flags, exist); if (unlikely(rc == -EEXIST)) { rc = 1; /* XXX: There are trouble things when adding OI @@ -180,7 +182,8 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, if (rc < 0) CDEBUG(D_LFSCK, "%s: fail to refresh OI map for scrub op %d " DFID" => %u/%u: rc = %d\n", osd_name(dev), ops, - PFID(fid), id->oii_ino, id->oii_gen, rc); + PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1, + rc); RETURN(rc); } @@ -272,7 +275,7 @@ void osd_scrub_file_reset(struct osd_scrub *scrub, __u8 *uuid, __u64 flags) struct scrub_file *sf = &scrub->os_file; CDEBUG(D_LFSCK, "%.16s: reset OI scrub file, old flags = " - LPX64", add flags = "LPX64"\n", + "%#llx, add flags = %#llx\n", osd_scrub2name(scrub), sf->sf_flags, flags); memcpy(sf->sf_uuid, uuid, 16); @@ -370,6 +373,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, { struct filter_fid_old *ff = &info->oti_ff; struct dentry *dentry = &info->oti_obj_dentry; + struct lu_fid *tfid = &info->oti_fid; handle_t *jh; int size = 0; int rc; @@ -380,6 +384,15 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, if (dev->od_scrub.os_file.sf_param & SP_DRYRUN) RETURN(0); + if (fid_is_idif(fid) && dev->od_index_in_idif == 0) { + struct ost_id *oi = &info->oti_ostid; + + fid_to_ostid(fid, oi); + ostid_to_fid(tfid, oi, 0); + } else { + *tfid = *fid; + } + /* We want the LMA to fit into the 256-byte OST inode, so operate * as following: * 1) read old XATTR_NAME_FID and save the parent FID; @@ -395,7 +408,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, if (IS_ERR(jh)) { rc = PTR_ERR(jh); CDEBUG(D_LFSCK, "%s: fail to start trans for convert ff " - DFID": rc = %d\n", osd_name(dev), PFID(fid), rc); + DFID": rc = %d\n", osd_name(dev), PFID(tfid), rc); RETURN(rc); } @@ -416,7 +429,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, } /* 3) make new LMA and add it */ - rc = osd_ea_fid_set(info, inode, fid, LMAC_FID_ON_OST, 0); + rc = osd_ea_fid_set(info, inode, tfid, LMAC_FID_ON_OST, 0); if (rc == 0 && reset) size = sizeof(struct filter_fid); else if (rc != 0 && removed) @@ -439,7 +452,7 @@ stop: ldiskfs_journal_stop(jh); if (rc < 0) CDEBUG(D_LFSCK, "%s: fail to convert ff "DFID": rc = %d\n", - osd_name(dev), PFID(fid), rc); + osd_name(dev), PFID(tfid), rc); return rc; } @@ -455,9 +468,9 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev, struct osd_inconsistent_item *oii = NULL; struct inode *inode = NULL; int ops = DTO_INDEX_UPDATE; - int idx; int rc; bool converted = false; + bool exist = false; ENTRY; down_write(&scrub->os_rwsem); @@ -485,6 +498,10 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev, GOTO(out, rc); } + /* The inode has been reused as EA inode, ignore it. */ + if (unlikely(osd_is_ea_inode(inode))) + GOTO(out, rc = 0); + sf->sf_flags |= SF_UPGRADE; sf->sf_internal_flags &= ~SIF_NO_HANDLE_OLD_FID; dev->od_check_ff = 1; @@ -499,14 +516,19 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev, (!scrub->os_convert_igif || OBD_FAIL_CHECK(OBD_FAIL_FID_NOLMA))) GOTO(out, rc = 0); - if ((oii != NULL && oii->oii_insert) || (val == SCRUB_NEXT_NOLMA)) + if ((oii != NULL && oii->oii_insert) || (val == SCRUB_NEXT_NOLMA)) { + ops = DTO_INDEX_INSERT; + goto iget; + } rc = osd_oi_lookup(info, dev, fid, lid2, (val == SCRUB_NEXT_OSTOBJ || val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0); if (rc != 0) { - if (rc != -ENOENT && rc != -ESTALE) + if (rc == -ENOENT) + ops = DTO_INDEX_INSERT; + else if (rc != -ESTALE) GOTO(out, rc); iget: @@ -519,13 +541,15 @@ iget: rc = 0; GOTO(out, rc); } + + /* The inode has been reused as EA inode, ignore it. */ + if (unlikely(osd_is_ea_inode(inode))) + GOTO(out, rc = 0); } if (!scrub->os_partial_scan) scrub->os_full_speed = 1; - ops = DTO_INDEX_INSERT; - idx = osd_oi_fid2idx(dev, fid); switch (val) { case SCRUB_NEXT_NOLMA: sf->sf_flags |= SF_UPGRADE; @@ -543,9 +567,6 @@ iget: case SCRUB_NEXT_OSTOBJ_OLD: break; default: - sf->sf_flags |= SF_RECREATED; - if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap))) - ldiskfs_set_bit(idx, sf->sf_oi_bitmap); break; } } else if (osd_id_eq(lid, lid2)) { @@ -576,15 +597,21 @@ iget: rc = osd_scrub_refresh_mapping(info, dev, fid, lid, ops, false, (val == SCRUB_NEXT_OSTOBJ || - val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0); + val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0, + &exist); if (rc == 0) { if (scrub->os_in_prior) sf->sf_items_updated_prior++; else sf->sf_items_updated++; - /* The target has been changed, need to be re-loaded. */ - lu_object_purge(info->oti_env, osd2lu_dev(dev), fid); + if (ops == DTO_INDEX_INSERT && val == 0 && !exist) { + int idx = osd_oi_fid2idx(dev, fid); + + sf->sf_flags |= SF_RECREATED; + if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap))) + ldiskfs_set_bit(idx, sf->sf_oi_bitmap); + } } GOTO(out, rc); @@ -602,25 +629,27 @@ out: /* There may be conflict unlink during the OI scrub, * if happend, then remove the new added OI mapping. */ if (ops == DTO_INDEX_INSERT && inode != NULL && !IS_ERR(inode) && - unlikely(inode->i_nlink == 0)) + unlikely(ldiskfs_test_inode_state(inode, + LDISKFS_STATE_LUSTRE_DESTROY))) osd_scrub_refresh_mapping(info, dev, fid, lid, DTO_INDEX_DELETE, false, (val == SCRUB_NEXT_OSTOBJ || val == SCRUB_NEXT_OSTOBJ_OLD) ? - OI_KNOWN_ON_OST : 0); + OI_KNOWN_ON_OST : 0, NULL); up_write(&scrub->os_rwsem); if (inode != NULL && !IS_ERR(inode)) iput(inode); if (oii != NULL) { - LASSERT(!list_empty(&oii->oii_list)); - spin_lock(&scrub->os_lock); - list_del_init(&oii->oii_list); + if (likely(!list_empty(&oii->oii_list))) + list_del(&oii->oii_list); spin_unlock(&scrub->os_lock); + OBD_FREE_PTR(oii); } + RETURN(sf->sf_param & SP_FAILOUT ? rc : 0); } @@ -728,9 +757,10 @@ static int osd_scrub_checkpoint(struct osd_scrub *scrub) return rc; } -static void osd_scrub_post(struct osd_scrub *scrub, int result) +static int osd_scrub_post(struct osd_scrub *scrub, int result) { struct scrub_file *sf = &scrub->os_file; + int rc; ENTRY; CDEBUG(D_LFSCK, "%.16s: OI scrub post, result = %d\n", @@ -770,10 +800,10 @@ static void osd_scrub_post(struct osd_scrub *scrub, int result) } sf->sf_run_time += cfs_duration_sec(cfs_time_current() + HALF_SEC - scrub->os_time_last_checkpoint); - result = osd_scrub_file_store(scrub); + rc = osd_scrub_file_store(scrub); up_write(&scrub->os_rwsem); - EXIT; + RETURN(rc < 0 ? rc : result); } /* iteration engine */ @@ -945,6 +975,10 @@ static int osd_iit_iget(struct osd_thread_info *info, struct osd_device *dev, RETURN(rc); } + /* It is an EA inode, no OI mapping for it, skip it. */ + if (osd_is_ea_inode(inode)) + GOTO(put, rc = SCRUB_NEXT_CONTINUE); + if (scrub && ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB)) { /* Only skip it for the first OI scrub accessing. */ @@ -975,10 +1009,11 @@ static int osd_scrub_next(struct osd_thread_info *info, struct osd_device *dev, struct l_wait_info lwi; lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val), NULL, NULL); - l_wait_event(thread->t_ctl_waitq, - !list_empty(&scrub->os_inconsistent_items) || - !thread_is_running(thread), - &lwi); + if (likely(lwi.lwi_timeout > 0)) + l_wait_event(thread->t_ctl_waitq, + !list_empty(&scrub->os_inconsistent_items) || + !thread_is_running(thread), + &lwi); } if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) { @@ -995,13 +1030,20 @@ static int osd_scrub_next(struct osd_thread_info *info, struct osd_device *dev, return SCRUB_NEXT_EXIT; if (!list_empty(&scrub->os_inconsistent_items)) { - struct osd_inconsistent_item *oii; + spin_lock(&scrub->os_lock); + if (likely(!list_empty(&scrub->os_inconsistent_items))) { + struct osd_inconsistent_item *oii; - oii = list_entry(scrub->os_inconsistent_items.next, - struct osd_inconsistent_item, oii_list); - *oic = &oii->oii_cache; - scrub->os_in_prior = 1; - return 0; + oii = list_entry(scrub->os_inconsistent_items.next, + struct osd_inconsistent_item, oii_list); + spin_unlock(&scrub->os_lock); + + *oic = &oii->oii_cache; + scrub->os_in_prior = 1; + + return 0; + } + spin_unlock(&scrub->os_lock); } if (noslot) @@ -1088,8 +1130,10 @@ static int osd_scrub_exec(struct osd_thread_info *info, struct osd_device *dev, } rc = osd_scrub_check_update(info, dev, oic, rc); - if (rc != 0) + if (rc != 0) { + scrub->os_in_prior = 0; return rc; + } rc = osd_scrub_checkpoint(scrub); if (rc != 0) { @@ -1182,16 +1226,16 @@ static void osd_scrub_join(struct osd_device *dev, __u32 flags, sf->sf_status = SS_SCANNING; } - if (flags & SS_AUTO_FULL) { - sf->sf_flags |= SF_AUTO; - scrub->os_full_speed = 1; - } - if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE)) scrub->os_full_speed = 1; else scrub->os_full_speed = 0; + if (flags & SS_AUTO_FULL) { + sf->sf_flags |= SF_AUTO; + scrub->os_full_speed = 1; + } + scrub->os_new_checked = 0; if (sf->sf_pos_last_checkpoint != 0) sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1; @@ -1340,30 +1384,30 @@ full: pos = &ooc->ooc_pos_preload; count = &ooc->ooc_cached_items; } + + param.bg = (*pos - 1) / LDISKFS_INODES_PER_GROUP(param.sb); + param.offset = (*pos - 1) % LDISKFS_INODES_PER_GROUP(param.sb); + param.gbase = 1 + param.bg * LDISKFS_INODES_PER_GROUP(param.sb); limit = le32_to_cpu(LDISKFS_SB(param.sb)->s_es->s_inodes_count); while (*pos <= limit && *count < max) { - struct osd_idmap_cache *oic = NULL; struct ldiskfs_group_desc *desc; + bool next_group = false; - param.bg = (*pos - 1) / LDISKFS_INODES_PER_GROUP(param.sb); desc = ldiskfs_get_group_desc(param.sb, param.bg, NULL); - if (desc == NULL) + if (!desc) RETURN(-EIO); ldiskfs_lock_group(param.sb, param.bg); if (desc->bg_flags & cpu_to_le16(LDISKFS_BG_INODE_UNINIT)) { ldiskfs_unlock_group(param.sb, param.bg); - *pos = 1 + (param.bg + 1) * - LDISKFS_INODES_PER_GROUP(param.sb); - continue; + next_group = true; + goto next_group; } ldiskfs_unlock_group(param.sb, param.bg); - param.offset = (*pos - 1) % LDISKFS_INODES_PER_GROUP(param.sb); - param.gbase = 1 + param.bg * LDISKFS_INODES_PER_GROUP(param.sb); param.bitmap = ldiskfs_read_inode_bitmap(param.sb, param.bg); - if (param.bitmap == NULL) { + if (!param.bitmap) { CDEBUG(D_LFSCK, "%.16s: fail to read bitmap for %u, " "scrub will stop, urgent mode\n", osd_scrub2name(scrub), (__u32)param.bg); @@ -1372,14 +1416,19 @@ full: while (param.offset < LDISKFS_INODES_PER_GROUP(param.sb) && *count < max) { + struct osd_idmap_cache *oic = NULL; + if (param.offset + ldiskfs_itable_unused_count(param.sb, desc) > - LDISKFS_INODES_PER_GROUP(param.sb)) + LDISKFS_INODES_PER_GROUP(param.sb)) { + next_group = true; goto next_group; + } rc = next(info, dev, ¶m, &oic, noslot); switch (rc) { case SCRUB_NEXT_BREAK: + next_group = true; goto next_group; case SCRUB_NEXT_EXIT: brelse(param.bitmap); @@ -1400,7 +1449,18 @@ full: } next_group: - brelse(param.bitmap); + if (param.bitmap) { + brelse(param.bitmap); + param.bitmap = NULL; + } + + if (next_group) { + param.bg++; + param.offset = 0; + param.gbase = 1 + + param.bg * LDISKFS_INODES_PER_GROUP(param.sb); + *pos = param.gbase; + } } if (*pos > limit) @@ -1479,7 +1539,7 @@ static int osd_scrub_main(void *args) GOTO(post, rc); post: - osd_scrub_post(scrub, rc); + rc = osd_scrub_post(scrub, rc); CDEBUG(D_LFSCK, "%.16s: OI scrub: stop, pos = %u: rc = %d\n", osd_scrub2name(scrub), scrub->os_pos_current, rc); @@ -1507,12 +1567,29 @@ noenv: typedef int (*scandir_t)(struct osd_thread_info *, struct osd_device *, struct dentry *, filldir_t filldir); +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_varfid_fill(struct dir_context *buf, const char *name, + int namelen, loff_t offset, __u64 ino, + unsigned d_type); +static int osd_ios_lf_fill(struct dir_context *buf, const char *name, + int namelen, loff_t offset, __u64 ino, + unsigned d_type); +static int osd_ios_dl_fill(struct dir_context *buf, const char *name, + int namelen, loff_t offset, __u64 ino, + unsigned d_type); +static int osd_ios_uld_fill(struct dir_context *buf, const char *name, + int namelen, loff_t offset, __u64 ino, + unsigned d_type); +#else static int osd_ios_varfid_fill(void *buf, const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type); static int osd_ios_lf_fill(void *buf, const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type); static int osd_ios_dl_fill(void *buf, const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type); +static int osd_ios_uld_fill(void *buf, const char *name, int namelen, + loff_t offset, __u64 ino, unsigned d_type); +#endif static int osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev, @@ -1530,12 +1607,14 @@ enum osd_lf_flags { OLF_HIDE_FID = 0x0002, OLF_SHOW_NAME = 0x0004, OLF_NO_OI = 0x0008, + OLF_IDX_IN_FID = 0x0010, }; struct osd_lf_map { char *olm_name; struct lu_fid olm_fid; __u16 olm_flags; + __u16 olm_namelen; scandir_t olm_scandir; filldir_t olm_filldir; }; @@ -1543,108 +1622,310 @@ struct osd_lf_map { /* Add the new introduced local files in the list in the future. */ static const struct osd_lf_map osd_lf_maps[] = { /* CATALOGS */ - { CATLIST, { FID_SEQ_LOCAL_FILE, LLOG_CATALOGS_OID, 0 }, OLF_SHOW_NAME, - NULL, NULL }, + { + .olm_name = CATLIST, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = LLOG_CATALOGS_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(CATLIST) - 1, + }, /* CONFIGS */ - { MOUNT_CONFIGS_DIR, { FID_SEQ_LOCAL_FILE, MGS_CONFIGS_OID, 0 }, - OLF_SCAN_SUBITEMS, osd_ios_general_scan, - osd_ios_varfid_fill }, + { + .olm_name = MOUNT_CONFIGS_DIR, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = MGS_CONFIGS_OID, + }, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof(MOUNT_CONFIGS_DIR) - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_varfid_fill, + }, /* NIDTBL_VERSIONS */ - { MGS_NIDTBL_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, - osd_ios_general_scan, osd_ios_varfid_fill }, + { + .olm_name = MGS_NIDTBL_DIR, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof(MGS_NIDTBL_DIR) - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_varfid_fill, + }, /* PENDING */ - { "PENDING", { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = "PENDING", + .olm_namelen = sizeof("PENDING") - 1, + }, /* ROOT */ - { "ROOT", { FID_SEQ_ROOT, 1, 0 }, - OLF_SCAN_SUBITEMS | OLF_HIDE_FID, osd_ios_ROOT_scan, NULL }, + { + .olm_name = "ROOT", + .olm_fid = { + .f_seq = FID_SEQ_ROOT, + .f_oid = FID_OID_ROOT, + }, + .olm_flags = OLF_SCAN_SUBITEMS | OLF_HIDE_FID, + .olm_namelen = sizeof("ROOT") - 1, + .olm_scandir = osd_ios_ROOT_scan, + }, /* changelog_catalog */ - { CHANGELOG_CATALOG, { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = CHANGELOG_CATALOG, + .olm_namelen = sizeof(CHANGELOG_CATALOG) - 1, + }, /* changelog_users */ - { CHANGELOG_USERS, { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = CHANGELOG_USERS, + .olm_namelen = sizeof(CHANGELOG_USERS) - 1, + }, /* fld */ - { "fld", { FID_SEQ_LOCAL_FILE, FLD_INDEX_OID, 0 }, OLF_SHOW_NAME, - NULL, NULL }, + { + .olm_name = "fld", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = FLD_INDEX_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof("fld") - 1, + }, /* last_rcvd */ - { LAST_RCVD, { FID_SEQ_LOCAL_FILE, LAST_RECV_OID, 0 }, OLF_SHOW_NAME, - NULL, NULL }, - - /* lfsck_bookmark */ - { "lfsck_bookmark", { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = LAST_RCVD, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = LAST_RECV_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(LAST_RCVD) - 1, + }, + + /* reply_data */ + { + .olm_name = REPLY_DATA, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = REPLY_DATA_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(REPLY_DATA) - 1, + }, /* lov_objid */ - { LOV_OBJID, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OID, 0 }, OLF_SHOW_NAME, - NULL, NULL }, + { + .olm_name = LOV_OBJID, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = MDD_LOV_OBJ_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(LOV_OBJID) - 1, + }, /* lov_objseq */ - { LOV_OBJSEQ, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OSEQ, 0 }, - OLF_SHOW_NAME, NULL, NULL }, + { + .olm_name = LOV_OBJSEQ, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = MDD_LOV_OBJ_OSEQ, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(LOV_OBJSEQ) - 1, + }, /* quota_master */ - { QMT_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, - osd_ios_general_scan, osd_ios_varfid_fill }, + { + .olm_name = QMT_DIR, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof(QMT_DIR) - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_varfid_fill, + }, /* quota_slave */ - { QSD_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, - osd_ios_general_scan, osd_ios_varfid_fill }, + { + .olm_name = QSD_DIR, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof(QSD_DIR) - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_varfid_fill, + }, /* seq_ctl */ - { "seq_ctl", { FID_SEQ_LOCAL_FILE, FID_SEQ_CTL_OID, 0 }, - OLF_SHOW_NAME, NULL, NULL }, + { + .olm_name = "seq_ctl", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = FID_SEQ_CTL_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof("seq_ctl") - 1, + }, /* seq_srv */ - { "seq_srv", { FID_SEQ_LOCAL_FILE, FID_SEQ_SRV_OID, 0 }, - OLF_SHOW_NAME, NULL, NULL }, + { + .olm_name = "seq_srv", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = FID_SEQ_SRV_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof("seq_srv") - 1, + }, /* health_check */ - { HEALTH_CHECK, { FID_SEQ_LOCAL_FILE, OFD_HEALTH_CHECK_OID, 0 }, - OLF_SHOW_NAME, NULL, NULL }, + { + .olm_name = HEALTH_CHECK, + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = OFD_HEALTH_CHECK_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof(HEALTH_CHECK) - 1, + }, + + /* LFSCK */ + { + .olm_name = LFSCK_DIR, + .olm_namelen = sizeof(LFSCK_DIR) - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_varfid_fill, + }, + + /* lfsck_bookmark */ + { + .olm_name = LFSCK_BOOKMARK, + .olm_namelen = sizeof(LFSCK_BOOKMARK) - 1, + }, + + /* lfsck_layout */ + { + .olm_name = LFSCK_LAYOUT, + .olm_namelen = sizeof(LFSCK_LAYOUT) - 1, + }, /* lfsck_namespace */ - { "lfsck_namespace", { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = LFSCK_NAMESPACE, + .olm_namelen = sizeof(LFSCK_NAMESPACE) - 1, + }, /* OBJECTS, upgrade from old device */ - { OBJECTS, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, osd_ios_OBJECTS_scan, NULL }, + { + .olm_name = OBJECTS, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof(OBJECTS) - 1, + .olm_scandir = osd_ios_OBJECTS_scan, + }, /* lquota_v2.user, upgrade from old device */ - { "lquota_v2.user", { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = "lquota_v2.user", + .olm_namelen = sizeof("lquota_v2.user") - 1, + }, /* lquota_v2.group, upgrade from old device */ - { "lquota_v2.group", { 0, 0, 0 }, 0, NULL, NULL }, + { + .olm_name = "lquota_v2.group", + .olm_namelen = sizeof("lquota_v2.group") - 1, + }, /* LAST_GROUP, upgrade from old device */ - { "LAST_GROUP", { FID_SEQ_LOCAL_FILE, OFD_LAST_GROUP_OID, 0 }, - OLF_SHOW_NAME, NULL, NULL }, - - /* SLAVE_LOG, llog for destroy slave stripes of striped dir */ - { "SLAVE_LOG", { FID_SEQ_LOCAL_FILE, SLAVE_LLOG_CATALOGS_OID, 0 }, - OLF_SHOW_NAME, NULL, NULL }, + { + .olm_name = "LAST_GROUP", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = OFD_LAST_GROUP_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof("LAST_GROUP") - 1, + }, + + /* committed batchid for cross-MDT operation */ + { + .olm_name = "BATCHID", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = BATCHID_COMMITTED_OID, + }, + .olm_flags = OLF_SHOW_NAME, + .olm_namelen = sizeof("BATCHID") - 1, + }, + + /* OSP update logs update_log{_dir} use f_seq = FID_SEQ_UPDATE_LOG{_DIR} + * and f_oid = index for their log files. See lu_update_log{_dir}_fid() + * for more details. */ + + /* update_log */ + { + .olm_name = "update_log", + .olm_fid = { + .f_seq = FID_SEQ_UPDATE_LOG, + }, + .olm_flags = OLF_SHOW_NAME | OLF_IDX_IN_FID, + .olm_namelen = sizeof("update_log") - 1, + }, + + /* update_log_dir */ + { + .olm_name = "update_log_dir", + .olm_fid = { + .f_seq = FID_SEQ_UPDATE_LOG_DIR, + }, + .olm_flags = OLF_SHOW_NAME | OLF_SCAN_SUBITEMS | + OLF_IDX_IN_FID, + .olm_namelen = sizeof("update_log_dir") - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_uld_fill, + }, /* lost+found */ - { "lost+found", { FID_SEQ_LOCAL_FILE, OSD_LPF_OID, 0 }, - OLF_SCAN_SUBITEMS, osd_ios_general_scan, osd_ios_lf_fill }, - - { NULL, { 0, 0, 0 }, 0, NULL, NULL } + { + .olm_name = "lost+found", + .olm_fid = { + .f_seq = FID_SEQ_LOCAL_FILE, + .f_oid = OSD_LPF_OID, + }, + .olm_flags = OLF_SCAN_SUBITEMS, + .olm_namelen = sizeof("lost+found") - 1, + .olm_scandir = osd_ios_general_scan, + .olm_filldir = osd_ios_lf_fill, + }, + + { + .olm_name = NULL + } }; /* Add the new introduced files under .lustre/ in the list in the future. */ static const struct osd_lf_map osd_dl_maps[] = { /* .lustre/fid */ - { "fid", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_OBF, 0 }, 0, - NULL, NULL }, - + { + .olm_name = "fid", + .olm_fid = { + .f_seq = FID_SEQ_DOT_LUSTRE, + .f_oid = FID_OID_DOT_LUSTRE_OBF, + }, + .olm_namelen = sizeof("fid") - 1, + }, /* .lustre/lost+found */ - { "lost+found", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_LPF, 0 }, 0, - NULL, NULL }, - - { NULL, { 0, 0, 0 }, 0, NULL, NULL } + { + .olm_name = "lost+found", + .olm_fid = { + .f_seq = FID_SEQ_DOT_LUSTRE, + .f_oid = FID_OID_DOT_LUSTRE_LPF, + }, + .olm_namelen = sizeof("lost+found") - 1, + }, + { + .olm_name = NULL + } }; struct osd_ios_item { @@ -1670,7 +1951,19 @@ osd_ios_lookup_one_len(const char *name, struct dentry *parent, int namelen) struct dentry *dentry; dentry = ll_lookup_one_len(name, parent, namelen); - if (!IS_ERR(dentry) && dentry->d_inode == NULL) { + if (IS_ERR(dentry)) { + int rc = PTR_ERR(dentry); + + if (rc != -ENOENT) + CERROR("Fail to find %.*s in %.*s (%lu/%u): rc = %d\n", + namelen, name, parent->d_name.len, + parent->d_name.name, parent->d_inode->i_ino, + parent->d_inode->i_generation, rc); + + return dentry; + } + + if (dentry->d_inode == NULL) { dput(dentry); return ERR_PTR(-ENOENT); } @@ -1728,10 +2021,16 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev, osd_id_gen(id, inode->i_ino, inode->i_generation); if (rc == -ENODATA) { - if (fid == NULL || fid_is_zero(fid) || flags & OLF_HIDE_FID) + if (fid == NULL || fid_is_zero(fid) || flags & OLF_HIDE_FID) { lu_igif_build(&tfid, inode->i_ino, inode->i_generation); - else + } else { tfid = *fid; + if (flags & OLF_IDX_IN_FID) { + LASSERT(dev->od_index >= 0); + + tfid.f_oid = dev->od_index; + } + } rc = osd_ea_fid_set(info, inode, &tfid, 0, 0); if (rc != 0) { CDEBUG(D_LFSCK, "%s: fail to set LMA for init OI " @@ -1752,7 +2051,7 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev, RETURN(rc); rc = osd_scrub_refresh_mapping(info, dev, &tfid, id, - DTO_INDEX_INSERT, true, 0); + DTO_INDEX_INSERT, true, 0, NULL); if (rc > 0) rc = 0; @@ -1772,7 +2071,7 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev, } rc = osd_scrub_refresh_mapping(info, dev, &tfid, id, - DTO_INDEX_UPDATE, true, 0); + DTO_INDEX_UPDATE, true, 0, NULL); if (rc > 0) rc = 0; @@ -1783,10 +2082,16 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev, * It scans the /lost+found, and for the OST-object (with filter_fid * or filter_fid_old), move them back to its proper /O//d. */ -static int osd_ios_lf_fill(void *buf, const char *name, int namelen, +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_lf_fill(struct dir_context *buf, +#else +static int osd_ios_lf_fill(void *buf, +#endif + const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type) { - struct osd_ios_filldir_buf *fill_buf = buf; + struct osd_ios_filldir_buf *fill_buf = + (struct osd_ios_filldir_buf *)buf; struct osd_thread_info *info = fill_buf->oifb_info; struct osd_device *dev = fill_buf->oifb_dev; struct lu_fid *fid = &info->oti_fid; @@ -1851,10 +2156,16 @@ put: return 0; } -static int osd_ios_varfid_fill(void *buf, const char *name, int namelen, +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_varfid_fill(struct dir_context *buf, +#else +static int osd_ios_varfid_fill(void *buf, +#endif + const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type) { - struct osd_ios_filldir_buf *fill_buf = buf; + struct osd_ios_filldir_buf *fill_buf = + (struct osd_ios_filldir_buf *)buf; struct osd_device *dev = fill_buf->oifb_dev; struct dentry *child; int rc; @@ -1878,10 +2189,16 @@ static int osd_ios_varfid_fill(void *buf, const char *name, int namelen, RETURN(rc); } -static int osd_ios_dl_fill(void *buf, const char *name, int namelen, +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_dl_fill(struct dir_context *buf, +#else +static int osd_ios_dl_fill(void *buf, +#endif + const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type) { - struct osd_ios_filldir_buf *fill_buf = buf; + struct osd_ios_filldir_buf *fill_buf = + (struct osd_ios_filldir_buf *)buf; struct osd_device *dev = fill_buf->oifb_dev; const struct osd_lf_map *map; struct dentry *child; @@ -1893,7 +2210,7 @@ static int osd_ios_dl_fill(void *buf, const char *name, int namelen, RETURN(0); for (map = osd_dl_maps; map->olm_name != NULL; map++) { - if (strlen(map->olm_name) != namelen) + if (map->olm_namelen != namelen) continue; if (strncmp(map->olm_name, name, namelen) == 0) @@ -1914,10 +2231,51 @@ static int osd_ios_dl_fill(void *buf, const char *name, int namelen, RETURN(rc); } -static int osd_ios_root_fill(void *buf, const char *name, int namelen, +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_uld_fill(struct dir_context *buf, +#else +static int osd_ios_uld_fill(void *buf, +#endif + const char *name, int namelen, + loff_t offset, __u64 ino, unsigned d_type) +{ + struct osd_ios_filldir_buf *fill_buf = + (struct osd_ios_filldir_buf *)buf; + struct dentry *child; + struct lu_fid tfid; + int rc = 0; + ENTRY; + + /* skip any non-DFID format name */ + if (name[0] != '[') + RETURN(0); + + child = osd_ios_lookup_one_len(name, fill_buf->oifb_dentry, namelen); + if (IS_ERR(child)) + RETURN(PTR_ERR(child)); + + /* skip the start '[' */ + sscanf(&name[1], SFID, RFID(&tfid)); + if (fid_is_sane(&tfid)) + rc = osd_ios_scan_one(fill_buf->oifb_info, fill_buf->oifb_dev, + child->d_inode, &tfid, 0); + else + rc = -EIO; + dput(child); + + RETURN(rc); +} + +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ios_root_fill(struct dir_context *buf, +#else +static int osd_ios_root_fill(void *buf, +#endif + const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type) { - struct osd_ios_filldir_buf *fill_buf = buf; + struct osd_ios_filldir_buf *fill_buf = + (struct osd_ios_filldir_buf *)buf; struct osd_device *dev = fill_buf->oifb_dev; const struct osd_lf_map *map; struct dentry *child; @@ -1929,7 +2287,7 @@ static int osd_ios_root_fill(void *buf, const char *name, int namelen, RETURN(0); for (map = osd_lf_maps; map->olm_name != NULL; map++) { - if (strlen(map->olm_name) != namelen) + if (map->olm_namelen != namelen) continue; if (strncmp(map->olm_name, name, namelen) == 0) @@ -1965,7 +2323,7 @@ osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev, .oifb_info = info, .oifb_dev = dev, .oifb_dentry = dentry }; - struct file *filp = &info->oti_it_ea.oie_file; + struct file *filp = &info->oti_file; struct inode *inode = dentry->d_inode; const struct file_operations *fops = inode->i_fop; int rc; @@ -1974,7 +2332,7 @@ osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev, LASSERT(filldir != NULL); filp->f_pos = 0; - filp->f_dentry = dentry; + filp->f_path.dentry = dentry; filp->f_mode = FMODE_64BITHASH; filp->f_mapping = inode->i_mapping; filp->f_op = fops; @@ -2171,13 +2529,13 @@ static int osd_initial_OI_scrub(struct osd_thread_info *info, child = osd_ios_lookup_one_len(map->olm_name, osd_sb(dev)->s_root, - strlen(map->olm_name)); + map->olm_namelen); if (!IS_ERR(child)) dput(child); else if (PTR_ERR(child) == -ENOENT) osd_scrub_refresh_mapping(info, dev, &map->olm_fid, NULL, DTO_INDEX_DELETE, - true, 0); + true, 0, NULL); map++; } @@ -2220,7 +2578,9 @@ static int do_osd_scrub_start(struct osd_device *dev, __u32 flags) again: if (thread_is_running(thread)) { spin_unlock(&scrub->os_lock); - if (!scrub->os_partial_scan || flags & SS_AUTO_PARTIAL) + if (!(scrub->os_file.sf_flags & SF_AUTO || + scrub->os_partial_scan) || + (flags & SS_AUTO_PARTIAL)) RETURN(-EALREADY); osd_scrub_join(dev, flags, false); @@ -2328,7 +2688,8 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) struct file *filp; struct inode *inode; struct lu_fid *fid = &info->oti_fid; - int dirty = 0; + bool dirty = false; + bool restored = false; int rc = 0; ENTRY; @@ -2350,7 +2711,7 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) RETURN(PTR_ERR(filp)); } - inode = filp->f_dentry->d_inode; + inode = file_inode(filp); /* 'What the @fid is' is not imporatant, because the object * has no OI mapping, and only is visible inside the OSD.*/ lu_igif_build(fid, inode->i_ino, inode->i_generation); @@ -2382,16 +2743,38 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) * have their FID mapping in OI files already. */ if (dev->od_maybe_new) sf->sf_internal_flags = SIF_NO_HANDLE_OLD_FID; - dirty = 1; + dirty = true; } else if (rc != 0) { GOTO(cleanup_inode, rc); } else { if (memcmp(sf->sf_uuid, es->s_uuid, 16) != 0) { + struct obd_uuid *old_uuid; + struct obd_uuid *new_uuid; + + OBD_ALLOC_PTR(old_uuid); + OBD_ALLOC_PTR(new_uuid); + if (old_uuid == NULL || new_uuid == NULL) { + CERROR("%.16s: UUID has been changed, but" + "failed to allocate RAM for report\n", + LDISKFS_SB(sb)->s_es->s_volume_name); + } else { + class_uuid_unparse(sf->sf_uuid, old_uuid); + class_uuid_unparse(es->s_uuid, new_uuid); + CERROR("%.16s: UUID has been changed from " + "%s to %s\n", + LDISKFS_SB(sb)->s_es->s_volume_name, + old_uuid->uuid, new_uuid->uuid); + } osd_scrub_file_reset(scrub, es->s_uuid,SF_INCONSISTENT); - dirty = 1; + dirty = true; + restored = true; + if (old_uuid != NULL) + OBD_FREE_PTR(old_uuid); + if (new_uuid != NULL) + OBD_FREE_PTR(new_uuid); } else if (sf->sf_status == SS_SCANNING) { sf->sf_status = SS_CRASHED; - dirty = 1; + dirty = true; } } @@ -2400,14 +2783,14 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) else scrub->os_pos_current = LDISKFS_FIRST_INO(sb) + 1; - if (dirty != 0) { + if (dirty) { rc = osd_scrub_file_store(scrub); if (rc != 0) GOTO(cleanup_inode, rc); } /* Initialize OI files. */ - rc = osd_oi_init(info, dev); + rc = osd_oi_init(info, dev, restored); if (rc < 0) GOTO(cleanup_inode, rc); @@ -2484,8 +2867,7 @@ void osd_scrub_cleanup(const struct lu_env *env, struct osd_device *dev) /* object table based iteration APIs */ static struct dt_it *osd_otable_it_init(const struct lu_env *env, - struct dt_object *dt, __u32 attr, - struct lustre_capa *capa) + struct dt_object *dt, __u32 attr) { enum dt_otable_it_flags flags = attr >> DT_OTABLE_IT_FLAGS_SHIFT; enum dt_otable_it_valid valid = attr & ~DT_OTABLE_IT_FLAGS_MASK; @@ -2697,6 +3079,8 @@ static int osd_otable_it_load(const struct lu_env *env, if (it->ooi_user_ready) RETURN(-EPERM); + LASSERT(!scrub->os_partial_scan); + if (hash > OSD_OTABLE_MAX_HASH) hash = OSD_OTABLE_MAX_HASH; @@ -2842,50 +3226,38 @@ static const char *scrub_param_names[] = { NULL }; -static int scrub_bits_dump(struct seq_file *m, int bits, const char *names[], - const char *prefix) +static void scrub_bits_dump(struct seq_file *m, int bits, const char *names[], + const char *prefix) { int flag; - int rc; int i; - rc = seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n'); - if (rc < 0) - return rc; + seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n'); for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) { if (flag & bits) { bits &= ~flag; - rc = seq_printf(m, "%s%c", names[i], - bits != 0 ? ',' : '\n'); - if (rc < 0) - return rc; + seq_printf(m, "%s%c", names[i], + bits != 0 ? ',' : '\n'); } } - return 0; } -static int scrub_time_dump(struct seq_file *m, __u64 time, const char *prefix) +static void scrub_time_dump(struct seq_file *m, __u64 time, const char *prefix) { - int rc; - if (time != 0) - rc = seq_printf(m, "%s: "LPU64" seconds\n", prefix, - cfs_time_current_sec() - time); + seq_printf(m, "%s: %llu seconds\n", prefix, + cfs_time_current_sec() - time); else - rc = seq_printf(m, "%s: N/A\n", prefix); - return rc; + seq_printf(m, "%s: N/A\n", prefix); } -static int scrub_pos_dump(struct seq_file *m, __u64 pos, const char *prefix) +static void scrub_pos_dump(struct seq_file *m, __u64 pos, const char *prefix) { - int rc; - if (pos != 0) - rc = seq_printf(m, "%s: "LPU64"\n", prefix, pos); + seq_printf(m, "%s: %llu\n", prefix, pos); else - rc = seq_printf(m, "%s: N/A\n", prefix); - return rc; + seq_printf(m, "%s: N/A\n", prefix); } int osd_scrub_dump(struct seq_file *m, struct osd_device *dev) @@ -2894,71 +3266,48 @@ int osd_scrub_dump(struct seq_file *m, struct osd_device *dev) struct scrub_file *sf = &scrub->os_file; __u64 checked; __u64 speed; - int rc; down_read(&scrub->os_rwsem); - rc = seq_printf(m, "name: OI_scrub\n" - "magic: 0x%x\n" - "oi_files: %d\n" - "status: %s\n", - sf->sf_magic, (int)sf->sf_oi_count, - scrub_status_names[sf->sf_status]); - if (rc < 0) - goto out; + seq_printf(m, "name: OI_scrub\n" + "magic: 0x%x\n" + "oi_files: %d\n" + "status: %s\n", + sf->sf_magic, (int)sf->sf_oi_count, + scrub_status_names[sf->sf_status]); - rc = scrub_bits_dump(m, sf->sf_flags, scrub_flags_names, - "flags"); - if (rc < 0) - goto out; + scrub_bits_dump(m, sf->sf_flags, scrub_flags_names, "flags"); - rc = scrub_bits_dump(m, sf->sf_param, scrub_param_names, - "param"); - if (rc < 0) - goto out; + scrub_bits_dump(m, sf->sf_param, scrub_param_names, "param"); - rc = scrub_time_dump(m, sf->sf_time_last_complete, - "time_since_last_completed"); - if (rc < 0) - goto out; + scrub_time_dump(m, sf->sf_time_last_complete, + "time_since_last_completed"); - rc = scrub_time_dump(m, sf->sf_time_latest_start, - "time_since_latest_start"); - if (rc < 0) - goto out; + scrub_time_dump(m, sf->sf_time_latest_start, + "time_since_latest_start"); - rc = scrub_time_dump(m, sf->sf_time_last_checkpoint, - "time_since_last_checkpoint"); - if (rc < 0) - goto out; + scrub_time_dump(m, sf->sf_time_last_checkpoint, + "time_since_last_checkpoint"); - rc = scrub_pos_dump(m, sf->sf_pos_latest_start, - "latest_start_position"); - if (rc < 0) - goto out; + scrub_pos_dump(m, sf->sf_pos_latest_start, + "latest_start_position"); - rc = scrub_pos_dump(m, sf->sf_pos_last_checkpoint, - "last_checkpoint_position"); - if (rc < 0) - goto out; + scrub_pos_dump(m, sf->sf_pos_last_checkpoint, + "last_checkpoint_position"); - rc = scrub_pos_dump(m, sf->sf_pos_first_inconsistent, - "first_failure_position"); - if (rc < 0) - goto out; + scrub_pos_dump(m, sf->sf_pos_first_inconsistent, + "first_failure_position"); checked = sf->sf_items_checked + scrub->os_new_checked; - rc = seq_printf(m, "checked: "LPU64"\n" - "updated: "LPU64"\n" - "failed: "LPU64"\n" - "prior_updated: "LPU64"\n" - "noscrub: "LPU64"\n" - "igif: "LPU64"\n" - "success_count: %u\n", - checked, sf->sf_items_updated, sf->sf_items_failed, - sf->sf_items_updated_prior, sf->sf_items_noscrub, - sf->sf_items_igif, sf->sf_success_count); - if (rc < 0) - goto out; + seq_printf(m, "checked: %llu\n" + "updated: %llu\n" + "failed: %llu\n" + "prior_updated: %llu\n" + "noscrub: %llu\n" + "igif: %llu\n" + "success_count: %u\n", + checked, sf->sf_items_updated, sf->sf_items_failed, + sf->sf_items_updated_prior, sf->sf_items_noscrub, + sf->sf_items_igif, sf->sf_success_count); speed = checked; if (thread_is_running(&scrub->os_thread)) { @@ -2973,31 +3322,30 @@ int osd_scrub_dump(struct seq_file *m, struct osd_device *dev) do_div(new_checked, duration); if (rtime != 0) do_div(speed, rtime); - rc = seq_printf(m, "run_time: %u seconds\n" - "average_speed: "LPU64" objects/sec\n" - "real-time_speed: "LPU64" objects/sec\n" - "current_position: %u\n" - "lf_scanned: "LPU64"\n" - "lf_reparied: "LPU64"\n" - "lf_failed: "LPU64"\n", - rtime, speed, new_checked, scrub->os_pos_current, - scrub->os_lf_scanned, scrub->os_lf_repaired, - scrub->os_lf_failed); + seq_printf(m, "run_time: %u seconds\n" + "average_speed: %llu objects/sec\n" + "real-time_speed: %llu objects/sec\n" + "current_position: %u\n" + "lf_scanned: %llu\n" + "lf_repaired: %llu\n" + "lf_failed: %llu\n", + rtime, speed, new_checked, scrub->os_pos_current, + scrub->os_lf_scanned, scrub->os_lf_repaired, + scrub->os_lf_failed); } else { if (sf->sf_run_time != 0) do_div(speed, sf->sf_run_time); - rc = seq_printf(m, "run_time: %u seconds\n" - "average_speed: "LPU64" objects/sec\n" - "real-time_speed: N/A\n" - "current_position: N/A\n" - "lf_scanned: "LPU64"\n" - "lf_reparied: "LPU64"\n" - "lf_failed: "LPU64"\n", - sf->sf_run_time, speed, scrub->os_lf_scanned, - scrub->os_lf_repaired, scrub->os_lf_failed); + seq_printf(m, "run_time: %u seconds\n" + "average_speed: %llu objects/sec\n" + "real-time_speed: N/A\n" + "current_position: N/A\n" + "lf_scanned: %llu\n" + "lf_repaired: %llu\n" + "lf_failed: %llu\n", + sf->sf_run_time, speed, scrub->os_lf_scanned, + scrub->os_lf_repaired, scrub->os_lf_failed); } -out: up_read(&scrub->os_rwsem); - return (rc < 0 ? -ENOSPC : 0); + return 0; }