X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_scrub.c;h=9a5572f81873a2b9a59acd0c2bd3da6375458674;hb=5afd3300d1ded80f79dbea92d47d287ad75f463a;hp=5e6ee4af2022c915a2b648543cde9999fd9d0c5c;hpb=2dc1bb8b7a53077fce8632aabe65b2ce8048a550;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c index 5e6ee4a..9a5572f 100644 --- a/lustre/osd-ldiskfs/osd_scrub.c +++ b/lustre/osd-ldiskfs/osd_scrub.c @@ -91,29 +91,29 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, struct osd_device *dev, const struct lu_fid *fid, const struct osd_inode_id *id, - int ops, enum oi_check_flags flags) + int ops, bool force, + enum oi_check_flags flags) { - const struct lu_env *env = info->oti_env; - struct thandle *th; - struct osd_thandle *oh; - int rc; + handle_t *th; + int rc; ENTRY; - th = dt_trans_create(env, &dev->od_dt_dev); - if (IS_ERR(th)) - RETURN(PTR_ERR(th)); + if (dev->od_scrub.os_file.sf_param & SP_DRYRUN && !force) + RETURN(0); - oh = container_of0(th, struct osd_thandle, ot_super); - LASSERT(oh->ot_handle == NULL); + /* DTO_INDEX_INSERT is enough for other two ops: + * delete/update, but save stack. */ + th = ldiskfs_journal_start_sb(osd_sb(dev), + osd_dto_credits_noquota[DTO_INDEX_INSERT]); + if (IS_ERR(th)) { + rc = PTR_ERR(th); + CERROR("%s: fail to start trans for scrub %d: rc = %d\n", + osd_name(dev), ops, rc); + RETURN(rc); + } switch (ops) { case DTO_INDEX_UPDATE: - osd_trans_declare_op(env, oh, OSD_OT_UPDATE, - osd_dto_credits_noquota[DTO_INDEX_UPDATE]); - rc = dt_trans_start_local(env, &dev->od_dt_dev, th); - if (rc != 0) - GOTO(stop, rc); - rc = osd_oi_update(info, dev, fid, id, th, flags); if (unlikely(rc == -ENOENT)) { /* Some unlink thread may removed the OI mapping. */ @@ -121,12 +121,6 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, } break; case DTO_INDEX_INSERT: - osd_trans_declare_op(env, oh, OSD_OT_INSERT, - osd_dto_credits_noquota[DTO_INDEX_INSERT]); - rc = dt_trans_start_local(env, &dev->od_dt_dev, th); - if (rc != 0) - GOTO(stop, rc); - rc = osd_oi_insert(info, dev, fid, id, th, flags); if (unlikely(rc == -EEXIST)) { rc = 1; @@ -164,12 +158,6 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, } break; case DTO_INDEX_DELETE: - osd_trans_declare_op(env, oh, OSD_OT_DELETE, - osd_dto_credits_noquota[DTO_INDEX_DELETE]); - rc = dt_trans_start_local(env, &dev->od_dt_dev, th); - if (rc != 0) - GOTO(stop, rc); - rc = osd_oi_delete(info, dev, fid, th, flags); if (rc == -ENOENT) { /* It is normal that the unlink thread has removed the @@ -182,10 +170,7 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, break; } - GOTO(stop, rc); - -stop: - dt_trans_stop(env, &dev->od_dt_dev, th); + ldiskfs_journal_stop(th); return rc; } @@ -279,7 +264,6 @@ void osd_scrub_file_reset(struct osd_scrub *scrub, __u8 *uuid, __u64 flags) memcpy(sf->sf_uuid, uuid, 16); sf->sf_status = SS_INIT; sf->sf_flags |= flags; - sf->sf_param = 0; sf->sf_run_time = 0; sf->sf_time_latest_start = 0; sf->sf_time_last_checkpoint = 0; @@ -339,7 +323,7 @@ int osd_scrub_file_store(struct osd_scrub *scrub) dev = container_of0(scrub, struct osd_device, od_scrub); credits = osd_dto_credits_noquota[DTO_WRITE_BASE] + osd_dto_credits_noquota[DTO_WRITE_BLOCK]; - jh = ldiskfs_journal_start_sb(osd_sb(dev), credits); + jh = osd_journal_start_sb(osd_sb(dev), LDISKFS_HT_MISC, credits); if (IS_ERR(jh)) { rc = PTR_ERR(jh); CERROR("%.16s: fail to start trans for scrub store, rc = %d\n", @@ -362,63 +346,6 @@ int osd_scrub_file_store(struct osd_scrub *scrub) return rc; } -/* OI scrub APIs */ - -static int osd_scrub_prep(struct osd_device *dev) -{ - struct osd_scrub *scrub = &dev->od_scrub; - struct ptlrpc_thread *thread = &scrub->os_thread; - struct scrub_file *sf = &scrub->os_file; - __u32 flags = scrub->os_start_flags; - int rc; - ENTRY; - - down_write(&scrub->os_rwsem); - if (flags & SS_SET_FAILOUT) - sf->sf_param |= SP_FAILOUT; - - if (flags & SS_CLEAR_FAILOUT) - sf->sf_param &= ~SP_FAILOUT; - - if (flags & SS_RESET) - osd_scrub_file_reset(scrub, - LDISKFS_SB(osd_sb(dev))->s_es->s_uuid, 0); - - if (flags & SS_AUTO) { - scrub->os_full_speed = 1; - sf->sf_flags |= SF_AUTO; - } else { - scrub->os_full_speed = 0; - } - - if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE)) - scrub->os_full_speed = 1; - - scrub->os_in_prior = 0; - scrub->os_waiting = 0; - scrub->os_paused = 0; - scrub->os_new_checked = 0; - if (sf->sf_pos_last_checkpoint != 0) - sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1; - else - sf->sf_pos_latest_start = LDISKFS_FIRST_INO(osd_sb(dev)) + 1; - - scrub->os_pos_current = sf->sf_pos_latest_start; - sf->sf_status = SS_SCANNING; - sf->sf_time_latest_start = cfs_time_current_sec(); - sf->sf_time_last_checkpoint = sf->sf_time_latest_start; - rc = osd_scrub_file_store(scrub); - if (rc == 0) { - spin_lock(&scrub->os_lock); - thread_set_flags(thread, SVC_RUNNING); - spin_unlock(&scrub->os_lock); - cfs_waitq_broadcast(&thread->t_ctl_waitq); - } - up_write(&scrub->os_rwsem); - - RETURN(rc); -} - static int osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, struct inode *inode, const struct lu_fid *fid) @@ -432,6 +359,9 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, bool reset = true; ENTRY; + if (dev->od_scrub.os_file.sf_param & SP_DRYRUN) + RETURN(0); + /* 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; @@ -442,7 +372,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, * Making the LMA to fit into the 256-byte OST inode can save time for * normal osd_check_lma() and for other OI scrub scanning in future. * So it is worth to make some slow conversion here. */ - jh = ldiskfs_journal_start_sb(osd_sb(dev), + jh = osd_journal_start_sb(osd_sb(dev), LDISKFS_HT_MISC, osd_dto_credits_noquota[DTO_XATTR_SET] * 3); if (IS_ERR(jh)) { rc = PTR_ERR(jh); @@ -482,7 +412,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev, rc1 = __osd_xattr_set(info, inode, XATTR_NAME_FID, ff, size, XATTR_CREATE); - if (rc1 != 0 && rc != 0) + if (rc1 != 0 && rc == 0) rc = rc1; } @@ -539,8 +469,6 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev, sf->sf_internal_flags &= ~SIF_NO_HANDLE_OLD_FID; dev->od_check_ff = 1; rc = osd_scrub_convert_ff(info, dev, inode, fid); - rc = osd_ea_fid_set(info, inode, fid, - LMAC_FID_ON_OST, 0); if (rc != 0) GOTO(out, rc); @@ -579,9 +507,11 @@ iget: switch (val) { case SCRUB_NEXT_NOLMA: sf->sf_flags |= SF_UPGRADE; - rc = osd_ea_fid_set(info, inode, fid, 0, 0); - if (rc != 0) - GOTO(out, rc); + if (!(sf->sf_param & SP_DRYRUN)) { + rc = osd_ea_fid_set(info, inode, fid, 0, 0); + if (rc != 0) + GOTO(out, rc); + } if (!(sf->sf_flags & SF_INCONSISTENT)) dev->od_igif_inoi = 0; @@ -620,7 +550,7 @@ iget: dev->od_igif_inoi = 1; } - rc = osd_scrub_refresh_mapping(info, dev, fid, lid, ops, + 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); if (rc == 0) { @@ -650,7 +580,7 @@ out: if (ops == DTO_INDEX_INSERT && inode != NULL && !IS_ERR(inode) && unlikely(inode->i_nlink == 0)) osd_scrub_refresh_mapping(info, dev, fid, lid, - DTO_INDEX_DELETE, + DTO_INDEX_DELETE, false, (val == SCRUB_NEXT_OSTOBJ || val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0); @@ -670,6 +600,78 @@ out: RETURN(sf->sf_param & SP_FAILOUT ? rc : 0); } +/* OI scrub APIs */ + +static int osd_scrub_prep(struct osd_device *dev) +{ + struct osd_scrub *scrub = &dev->od_scrub; + struct ptlrpc_thread *thread = &scrub->os_thread; + struct scrub_file *sf = &scrub->os_file; + __u32 flags = scrub->os_start_flags; + int rc; + bool drop_dryrun = false; + ENTRY; + + down_write(&scrub->os_rwsem); + if (flags & SS_SET_FAILOUT) + sf->sf_param |= SP_FAILOUT; + + if (flags & SS_CLEAR_FAILOUT) + sf->sf_param &= ~SP_FAILOUT; + + if (flags & SS_SET_DRYRUN) + sf->sf_param |= SP_DRYRUN; + + if (flags & SS_CLEAR_DRYRUN && sf->sf_param & SP_DRYRUN) { + sf->sf_param &= ~SP_DRYRUN; + drop_dryrun = true; + } + + if (flags & SS_RESET) + osd_scrub_file_reset(scrub, + LDISKFS_SB(osd_sb(dev))->s_es->s_uuid, 0); + + if (flags & SS_AUTO) { + scrub->os_full_speed = 1; + sf->sf_flags |= SF_AUTO; + /* For the case of OI scrub auto triggered, NOT dryrun. */ + sf->sf_param &= ~SP_FAILOUT; + } else { + scrub->os_full_speed = 0; + } + + if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE)) + scrub->os_full_speed = 1; + + scrub->os_in_prior = 0; + spin_lock(&scrub->os_lock); + scrub->os_waiting = 0; + scrub->os_paused = 0; + spin_unlock(&scrub->os_lock); + scrub->os_new_checked = 0; + if (drop_dryrun && sf->sf_pos_first_inconsistent != 0) + sf->sf_pos_latest_start = sf->sf_pos_first_inconsistent; + else if (sf->sf_pos_last_checkpoint != 0) + sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1; + else + sf->sf_pos_latest_start = LDISKFS_FIRST_INO(osd_sb(dev)) + 1; + + scrub->os_pos_current = sf->sf_pos_latest_start; + sf->sf_status = SS_SCANNING; + sf->sf_time_latest_start = cfs_time_current_sec(); + sf->sf_time_last_checkpoint = sf->sf_time_latest_start; + rc = osd_scrub_file_store(scrub); + if (rc == 0) { + spin_lock(&scrub->os_lock); + thread_set_flags(thread, SVC_RUNNING); + spin_unlock(&scrub->os_lock); + wake_up_all(&thread->t_ctl_waitq); + } + up_write(&scrub->os_rwsem); + + RETURN(rc); +} + static int osd_scrub_checkpoint(struct osd_scrub *scrub) { struct scrub_file *sf = &scrub->os_file; @@ -715,9 +717,11 @@ static void osd_scrub_post(struct osd_scrub *scrub, int result) dev->od_igif_inoi = 1; dev->od_check_ff = 0; sf->sf_status = SS_COMPLETED; - memset(sf->sf_oi_bitmap, 0, SCRUB_OI_BITMAP_SIZE); - sf->sf_flags &= ~(SF_RECREATED | SF_INCONSISTENT | - SF_UPGRADE | SF_AUTO); + if (!(sf->sf_param & SP_DRYRUN)) { + memset(sf->sf_oi_bitmap, 0, SCRUB_OI_BITMAP_SIZE); + sf->sf_flags &= ~(SF_RECREATED | SF_INCONSISTENT | + SF_UPGRADE | SF_AUTO); + } sf->sf_time_last_complete = sf->sf_time_last_checkpoint; sf->sf_success_count++; } else if (result == 0) { @@ -787,7 +791,10 @@ static int osd_scrub_check_local_fldb(struct osd_thread_info *info, * a small local FLDB according to the . If the given FID * is in the local FLDB, then it is FID-on-OST; otherwise it's * quite possible for FID-on-MDT. */ - return 0; + if (dev->od_is_ost) + return SCRUB_NEXT_OSTOBJ_OLD; + else + return 0; } static int osd_scrub_get_fid(struct osd_thread_info *info, @@ -801,36 +808,31 @@ static int osd_scrub_get_fid(struct osd_thread_info *info, rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma); if (rc == 0) { has_lma = true; - if (lma->lma_compat & LMAC_NOT_IN_OI) { - ldiskfs_set_inode_state(inode, - LDISKFS_STATE_LUSTRE_NO_OI); + if (lma->lma_compat & LMAC_NOT_IN_OI || + lma->lma_incompat & LMAI_AGENT) return SCRUB_NEXT_CONTINUE; - } *fid = lma->lma_self_fid; - if (fid_is_internal(&lma->lma_self_fid)) { - if (!scrub) - rc = SCRUB_NEXT_CONTINUE; - return rc; - } - if (!scrub) return 0; - if (fid_is_namespace_visible(fid) && !fid_is_norm(fid)) - return 0; - if (lma->lma_compat & LMAC_FID_ON_OST) return SCRUB_NEXT_OSTOBJ; - if (fid_is_idif(fid) || fid_is_last_id(fid)) + if (fid_is_idif(fid)) return SCRUB_NEXT_OSTOBJ_OLD; - if (lma->lma_incompat & LMAI_AGENT) - return SCRUB_NEXT_CONTINUE; + /* For local object. */ + if (fid_is_internal(fid)) + return 0; + + /* For external visible MDT-object with non-normal FID. */ + if (fid_is_namespace_visible(fid) && !fid_is_norm(fid)) + return 0; - /* Here, it may be MDT-object, or may be 2.4 OST-object. - * Fall through. */ + /* For the object with normal FID, it may be MDT-object, + * or may be 2.4 OST-object, need further distinguish. + * Fall through to next section. */ } if (rc == -ENODATA || rc == 0) { @@ -904,11 +906,6 @@ static int osd_iit_iget(struct osd_thread_info *info, struct osd_device *dev, RETURN(rc); } - /* If the inode has no OI mapping, then it is special locally used, - * should be invisible to OI scrub or up layer LFSCK. */ - if (ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI)) - 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. */ @@ -1072,11 +1069,11 @@ next: scrub->os_pos_current = param->gbase + ++(param->offset); wait: - if (it != NULL && it->ooi_waiting && + if (it != NULL && it->ooi_waiting && ooc != NULL && ooc->ooc_pos_preload < scrub->os_pos_current) { spin_lock(&scrub->os_lock); it->ooi_waiting = 0; - cfs_waitq_broadcast(&thread->t_ctl_waitq); + wake_up_all(&thread->t_ctl_waitq); spin_unlock(&scrub->os_lock); } @@ -1214,8 +1211,10 @@ static int osd_otable_it_preload(const struct lu_env *env, ooc->ooc_pos_preload, rc); if (scrub->os_waiting && osd_scrub_has_window(scrub, ooc)) { + spin_lock(&scrub->os_lock); scrub->os_waiting = 0; - cfs_waitq_broadcast(&scrub->os_thread.t_ctl_waitq); + wake_up_all(&scrub->os_thread.t_ctl_waitq); + spin_unlock(&scrub->os_lock); } RETURN(rc < 0 ? rc : ooc->ooc_cached_items); @@ -1286,7 +1285,7 @@ out: noenv: spin_lock(&scrub->os_lock); thread_set_flags(thread, SVC_STOPPED); - cfs_waitq_broadcast(&thread->t_ctl_waitq); + wake_up_all(&thread->t_ctl_waitq); spin_unlock(&scrub->os_lock); return rc; } @@ -1300,6 +1299,8 @@ 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_general_scan(struct osd_thread_info *info, struct osd_device *dev, @@ -1417,6 +1418,15 @@ static const struct osd_lf_map osd_lf_maps[] = { { NULL, { 0, 0, 0 }, 0, NULL, 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 }, + + { NULL, { 0, 0, 0 }, 0, NULL, NULL } +}; + struct osd_ios_item { cfs_list_t oii_list; struct dentry *oii_dentry; @@ -1435,6 +1445,9 @@ osd_ios_lookup_one_len(const char *name, struct dentry *parent, int namelen) { struct dentry *dentry; + CDEBUG(D_LFSCK, "init lookup one: parent = %.*s, name = %.*s\n", + parent->d_name.len, parent->d_name.name, namelen, name); + dentry = ll_lookup_one_len(name, parent, namelen); if (!IS_ERR(dentry) && dentry->d_inode == NULL) { dput(dentry); @@ -1449,17 +1462,19 @@ osd_ios_new_item(struct osd_device *dev, struct dentry *dentry, scandir_t scandir, filldir_t filldir) { struct osd_ios_item *item; + ENTRY; OBD_ALLOC_PTR(item); if (item == NULL) - return -ENOMEM; + RETURN(-ENOMEM); CFS_INIT_LIST_HEAD(&item->oii_list); item->oii_dentry = dget(dentry); item->oii_scandir = scandir; item->oii_filldir = filldir; cfs_list_add_tail(&item->oii_list, &dev->od_ios_list); - return 0; + + RETURN(0); } /** @@ -1482,6 +1497,8 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev, int rc; ENTRY; + CDEBUG(D_LFSCK, "init scan one: ino = %ld\n", inode->i_ino); + rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma); if (rc != 0 && rc != -ENODATA) RETURN(rc); @@ -1508,7 +1525,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, 0); + DTO_INDEX_INSERT, true, 0); if (rc > 0) rc = 0; @@ -1528,7 +1545,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, 0); + DTO_INDEX_UPDATE, true, 0); if (rc > 0) rc = 0; @@ -1633,6 +1650,42 @@ 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, + loff_t offset, __u64 ino, unsigned d_type) +{ + struct osd_ios_filldir_buf *fill_buf = buf; + struct osd_device *dev = fill_buf->oifb_dev; + const struct osd_lf_map *map; + struct dentry *child; + int rc = 0; + ENTRY; + + /* skip any '.' started names */ + if (name[0] == '.') + RETURN(0); + + for (map = osd_dl_maps; map->olm_name != NULL; map++) { + if (strlen(map->olm_name) != namelen) + continue; + + if (strncmp(map->olm_name, name, namelen) == 0) + break; + } + + if (map->olm_name == NULL) + RETURN(0); + + child = osd_ios_lookup_one_len(name, fill_buf->oifb_dentry, namelen); + if (IS_ERR(child)) + RETURN(PTR_ERR(child)); + + rc = osd_ios_scan_one(fill_buf->oifb_info, dev, child->d_inode, + &map->olm_fid, map->olm_flags); + dput(child); + + RETURN(rc); +} + static int osd_ios_root_fill(void *buf, const char *name, int namelen, loff_t offset, __u64 ino, unsigned d_type) { @@ -1692,6 +1745,7 @@ osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev, filp->f_mapping = inode->i_mapping; filp->f_op = fops; filp->private_data = NULL; + set_file_inode(filp, inode); rc = fops->readdir(filp, &buf, filldir); fops->release(inode, filp); @@ -1765,6 +1819,9 @@ osd_ios_ROOT_scan(struct osd_thread_info *info, struct osd_device *dev, * to the solution 2). */ rc = osd_ios_scan_one(info, dev, child->d_inode, &LU_DOT_LUSTRE_FID, 0); + if (rc == 0) + rc = osd_ios_new_item(dev, child, osd_ios_general_scan, + osd_ios_dl_fill); dput(child); } @@ -1824,6 +1881,9 @@ static int osd_initial_OI_scrub(struct osd_thread_info *info, int rc; ENTRY; + /* Lookup IGIF in OI by force for initial OI scrub. */ + dev->od_igif_inoi = 1; + while (1) { rc = scandir(info, dev, dentry, filldir); if (item != NULL) { @@ -1876,7 +1936,8 @@ static int osd_initial_OI_scrub(struct osd_thread_info *info, dput(child); else if (PTR_ERR(child) == -ENOENT) osd_scrub_refresh_mapping(info, dev, &map->olm_fid, - NULL, DTO_INDEX_DELETE, 0); + NULL, DTO_INDEX_DELETE, + true, 0); map++; } @@ -1969,7 +2030,7 @@ static void do_osd_scrub_stop(struct osd_scrub *scrub) if (!thread_is_init(thread) && !thread_is_stopped(thread)) { thread_set_flags(thread, SVC_STOPPING); spin_unlock(&scrub->os_lock); - cfs_waitq_broadcast(&thread->t_ctl_waitq); + wake_up_all(&thread->t_ctl_waitq); l_wait_event(thread->t_ctl_waitq, thread_is_stopped(thread), &lwi); @@ -2015,33 +2076,32 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) ctxt->pwd = dev->od_mnt->mnt_root; ctxt->fs = get_ds(); - cfs_waitq_init(&scrub->os_thread.t_ctl_waitq); + init_waitqueue_head(&scrub->os_thread.t_ctl_waitq); init_rwsem(&scrub->os_rwsem); spin_lock_init(&scrub->os_lock); CFS_INIT_LIST_HEAD(&scrub->os_inconsistent_items); - push_ctxt(&saved, ctxt, NULL); + push_ctxt(&saved, ctxt); filp = filp_open(osd_scrub_name, O_RDWR | O_CREAT, 0644); if (IS_ERR(filp)) { - pop_ctxt(&saved, ctxt, NULL); + pop_ctxt(&saved, ctxt); RETURN(PTR_ERR(filp)); } inode = filp->f_dentry->d_inode; - ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI); /* '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); rc = osd_ea_fid_set(info, inode, fid, LMAC_NOT_IN_OI, 0); if (rc != 0) { filp_close(filp, 0); - pop_ctxt(&saved, ctxt, NULL); + pop_ctxt(&saved, ctxt); RETURN(rc); } scrub->os_inode = igrab(inode); filp_close(filp, 0); - pop_ctxt(&saved, ctxt, NULL); + pop_ctxt(&saved, ctxt); rc = osd_scrub_file_load(scrub); if (rc == -ENOENT) { @@ -2095,7 +2155,7 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev) !(sf->sf_internal_flags & SIF_NO_HANDLE_OLD_FID || sf->sf_success_count > 0)) { dev->od_igif_inoi = 0; - dev->od_check_ff = 1; + dev->od_check_ff = dev->od_is_ost; } else { dev->od_igif_inoi = 1; dev->od_check_ff = 0; @@ -2188,6 +2248,13 @@ static struct dt_it *osd_otable_it_init(const struct lu_env *env, start |= SS_CLEAR_FAILOUT; } + if (valid & DOIV_DRYRUN) { + if (flags & DOIF_DRYRUN) + start |= SS_SET_DRYRUN; + else + start |= SS_CLEAR_DRYRUN; + } + rc = do_osd_scrub_start(dev, start); if (rc < 0 && rc != -EALREADY) { dev->od_otable_it = NULL; @@ -2278,7 +2345,7 @@ again: if (scrub->os_waiting && osd_scrub_has_window(scrub, ooc)) { spin_lock(&scrub->os_lock); scrub->os_waiting = 0; - cfs_waitq_broadcast(&scrub->os_thread.t_ctl_waitq); + wake_up_all(&scrub->os_thread.t_ctl_waitq); spin_unlock(&scrub->os_lock); } @@ -2366,7 +2433,7 @@ static int osd_otable_it_load(const struct lu_env *env, it->ooi_user_ready = 1; if (!scrub->os_full_speed) - cfs_waitq_broadcast(&scrub->os_thread.t_ctl_waitq); + wake_up_all(&scrub->os_thread.t_ctl_waitq); /* Unplug OSD layer iteration by the first next() call. */ rc = osd_otable_it_next(env, (struct dt_it *)it); @@ -2428,7 +2495,7 @@ int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic, spin_unlock(&scrub->os_lock); if (wakeup != 0) - cfs_waitq_broadcast(&thread->t_ctl_waitq); + wake_up_all(&thread->t_ctl_waitq); RETURN(0); } @@ -2476,6 +2543,7 @@ static const char *scrub_flags_names[] = { static const char *scrub_param_names[] = { "failout", + "dryrun", NULL };