*
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
+ * \param[in] obj pointer to the striped directory to be handled
* \param[in] lnr pointer to the namespace request that contains the
* striped directory to be handled and other information
*
*/
static int lfsck_remove_lmv(const struct lu_env *env,
struct lfsck_component *com,
+ struct dt_object *obj,
struct lfsck_namespace_req *lnr)
{
- struct dt_object *obj = lnr->lnr_obj;
struct lustre_handle lh = { 0 };
int rc;
*
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
+ * \param[in] dir pointer to the striped directory to be handled
* \param[in] lslr pointer to lfsck_disable_master_lmv slot which content
* will be replaced by the given information
* \param[in] lnr contain the shard's FID to be used to fill the
*/
static int lfsck_replace_lmv(const struct lu_env *env,
struct lfsck_component *com,
+ struct dt_object *dir,
struct lfsck_slave_lmv_rec *lslr,
struct lfsck_namespace_req *lnr,
struct lmv_mds_md_v1 *lmv,
struct lfsck_lmv *llmv = lnr->lnr_lmv;
int rc;
- rc = lfsck_remove_dirent(env, com, lnr->lnr_obj,
+ rc = lfsck_remove_dirent(env, com, dir,
&lslr->lslr_fid, index);
if (rc < 0)
return rc;
*
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
+ * \param[in] dir pointer to the striped directory to be handled
* \param[in] lnr contain the shard's FID to fill the @lslr slot,
* it also records the known max filled index and
* the known max stripe count
*/
static int lfsck_record_lmv(const struct lu_env *env,
struct lfsck_component *com,
+ struct dt_object *dir,
struct lfsck_namespace_req *lnr,
struct lmv_mds_md_v1 *lmv, __u32 shard_idx,
__u32 flags, __u32 flags2, __u32 *depth)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_lmv *llmv = lnr->lnr_lmv;
- struct dt_object *dir = lnr->lnr_obj;
const struct lu_fid *fid = &lnr->lnr_fid;
struct lfsck_slave_lmv_rec *lslr;
struct lfsck_rec_lmv_save *lrls;
* mark the master MDT-object as read-only. The
* administrator can handle the conflict with
* more human knowledge. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
break;
case LSLF_BAD_INDEX2:
GOTO(out, rc = -EEXIST);
* as read-only. The administrator can
* handle the conflict with more human
* knowledge. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
} else {
/* Otherwise, remove the current name entry,
* and add its FID in the LFSCK tracing file
/* The name entry claims an index that is conflict
* with a valid existing name entry, then try the
* index in the lmv recursively. */
- rc = lfsck_record_lmv(env, com, lnr, lmv, index,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
lmv->lmv_master_mdt_index = index;
if (rc == -ERANGE || rc == -EEXIST)
* not know how to resolve the conflict.
* We will handle it as handle the case
* of 'LSLF_NONE' vs 'LSLF_NONE'. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
break;
default:
* as read-only. The administrator can
* handle the conflict with more human
* knowledge. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
} else {
lrls = &lfsck->li_rec_lmv_save[*depth - 1];
lrls->lrls_fid = lslr->lslr_fid;
com, &lrls->lrls_fid,
LNTF_CHECK_PARENT, true);
if (rc == 0)
- rc = lfsck_replace_lmv(env, com, lslr,
- lnr, lmv, index, flags);
+ rc = lfsck_replace_lmv(env, com, dir,
+ lslr, lnr, lmv, index, flags);
}
break;
/* The name entry claims an index that is conflict
* with a valid existing name entry, then try the
* index in the lmv recursively. */
- rc = lfsck_record_lmv(env, com, lnr, lmv, index,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
lmv->lmv_master_mdt_index = index;
if (rc == -ERANGE || rc == -EEXIST) {
case LSLF_NO_LMVEA:
/* Remove the existing dangling name entry.
* Refill the lslr slot with the given LMV. */
- rc = lfsck_replace_lmv(env, com, lslr, lnr,
+ rc = lfsck_replace_lmv(env, com, dir, lslr, lnr,
lmv, index, flags);
break;
case LSLF_DANGLING:
/* The name entry claims an index that is conflict
* with a valid existing name entry, then try the
* index in the lmv recursively. */
- rc = lfsck_record_lmv(env, com, lnr, lmv, index,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
lmv->lmv_master_mdt_index = index;
if (rc == -ERANGE || rc == -EEXIST)
* also conflict with other, then remove
* the existing dangling name entry.
* Refill the lslr slot with the given LMV. */
- rc = lfsck_replace_lmv(env, com, lslr, lnr,
+ rc = lfsck_replace_lmv(env, com, dir, lslr, lnr,
lmv, shard_idx, flags);
break;
/* The existing one has another possible slot,
* try it recursively. */
- rc = lfsck_record_lmv(env, com, lnr, lmv, index,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
LSLF_BAD_INDEX2, flags, depth);
*lmv = lrls->lrls_lmv;
lnr->lnr_fid = lrls->lrls_fid;
* mark the master MDT-object as read-only. The
* administrator can handle the conflict with
* more human knowledge. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
break;
case LSLF_BAD_INDEX2:
GOTO(out, rc = -EEXIST);
/* The name entry claims an index that is conflict
* with a valid existing name entry, then try the
* index in the lmv recursively. */
- rc = lfsck_record_lmv(env, com, lnr, lmv, index,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
lmv->lmv_master_mdt_index = index;
if (rc == -ERANGE || rc == -EEXIST)
* not know how to resolve the conflict.
* We will handle it as handle the case
* of 'LSLF_NONE' vs 'LSLF_NONE'. */
- rc = lfsck_remove_lmv(env, com, lnr);
+ rc = lfsck_remove_lmv(env, com, dir, lnr);
break;
}
rc = 0;
while (rc == 0) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DELAY3) &&
- cfs_fail_val > 0) {
- struct l_wait_info lwi;
-
- lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val),
- NULL, NULL);
- l_wait_event(thread->t_ctl_waitq,
- !thread_is_running(thread),
- &lwi);
-
- if (unlikely(!thread_is_running(thread)))
- GOTO(out, rc = 0);
- }
+ if (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY3, cfs_fail_val) &&
+ unlikely(!thread_is_running(thread)))
+ GOTO(out, rc = 0);
rc = iops->rec(env, di, (struct dt_rec *)ent, args);
if (rc == 0)
char *name = info->lti_key;
char *name2;
struct lu_fid *pfid = &info->lti_fid3;
- struct lu_fid *tfid = &info->lti_fid4;
const struct lu_fid *cfid = lfsck_dto2fid(obj);
+ struct lu_fid tfid;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lmv_mds_md_v1 *clmv = &llmv->ll_lmv;
struct lmv_mds_md_v1 *plmv = &info->lti_lmv;
GOTO(out, rc);
}
+ if (unlikely(!dt_try_as_dir(env, parent)))
+ GOTO(out, rc = -ENOTDIR);
+
rc = lfsck_read_stripe_lmv(env, parent, plmv);
if (rc != 0) {
int rc1;
PFID(cfid), clmv->lmv_master_mdt_index);
name2 = info->lti_tmpbuf2;
- rc = lfsck_links_get_first(env, obj, name, tfid);
- if (rc == 0 && strcmp(name, name2) == 0 && lu_fid_eq(pfid, tfid)) {
+ rc = lfsck_links_get_first(env, obj, name, &tfid);
+ if (rc == 0 && strcmp(name, name2) == 0 && lu_fid_eq(pfid, &tfid)) {
llmv->ll_lmv_verified = 1;
GOTO(out, rc);
}
- rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
+ rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
(const struct dt_key *)name2, BYPASS_CAPA);
- if (rc != 0 || !lu_fid_eq(cfid, tfid))
+ if (rc != 0 || !lu_fid_eq(cfid, &tfid))
rc = lfsck_namespace_trace_update(env, com, cfid,
LNTF_UNCERTAIN_LMV, true);
else
*
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
+ * \paran[in] dir pointer to the striped directory or its shard to be
+ * rescanned
* \param[in] lnr pointer to the namespace request that contains the
* striped directory or the shard
*
*/
int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
struct lfsck_component *com,
+ struct dt_object *dir,
struct lfsck_namespace_req *lnr)
{
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lfsck_lmv *llmv = lnr->lnr_lmv;
struct lmv_mds_md_v1 *lmv = &llmv->ll_lmv;
struct lmv_mds_md_v1 *lmv2 = &info->lti_lmv2;
- struct dt_object *dir = lnr->lnr_obj;
const struct lu_fid *pfid = lfsck_dto2fid(dir);
struct lu_seq_range *range = &info->lti_range;
struct seq_server_site *ss =
struct lfsck_slave_lmv_rec *lslr = llmv->ll_lslr + i;
const struct lu_fid *cfid = &lslr->lslr_fid;
const struct lu_name *cname;
- struct linkea_data ldata = { 0 };
+ struct linkea_data ldata = { NULL };
int len;
int rc1 = 0;
bool repair_linkea = false;
repair:
if (create) {
- rc1 = lfsck_namespace_repair_dangling(env, com,
+ rc1 = lfsck_namespace_repair_dangling(env, com, dir,
obj, lnr);
if (rc1 >= 0) {
create_repaired = true;
*
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
+ * \param[in] dir pointer to the master MDT-object of the
+ * striped directory
* \param[in] lnr pointer to the namespace request that contains the
* shard's name, parent object, parent's LMV, and ect.
*
*/
int lfsck_namespace_handle_striped_master(const struct lu_env *env,
struct lfsck_component *com,
+ struct dt_object *dir,
struct lfsck_namespace_req *lnr)
{
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_namespace *ns = com->lc_file_ram;
struct lfsck_lmv *llmv = lnr->lnr_lmv;
- struct dt_object *dir = lnr->lnr_obj;
const struct lu_fid *pfid = lfsck_dto2fid(dir);
struct dt_object *obj = NULL;
struct dt_device *dev = NULL;
if (rc == 0) {
memset(lmv, 0, sizeof(*lmv));
lmv->lmv_magic = LMV_MAGIC;
- rc = lfsck_record_lmv(env, com, lnr, lmv, stripe,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
LSLF_DANGLING, LSLF_NONE, &depth);
}
goto dangling;
if (rc == -ENODATA)
- rc = lfsck_record_lmv(env, com, lnr, lmv, stripe,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
LSLF_NO_LMVEA, LSLF_NONE, &depth);
else if (rc == 0)
- rc = lfsck_record_lmv(env, com, lnr, lmv, stripe,
+ rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
lmv->lmv_master_mdt_index != stripe ?
LSLF_BAD_INDEX1 : LSLF_NONE, LSLF_NONE,
&depth);
CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail to handle "
"the shard: "DFID", parent "DFID", name %.*s: rc = %d\n",
lfsck_lfsck2name(lfsck), PFID(&lnr->lnr_fid),
- PFID(lfsck_dto2fid(lnr->lnr_obj)),
+ PFID(lfsck_dto2fid(dir)),
lnr->lnr_namelen, lnr->lnr_name, rc);
if ((rc == -ENOTCONN || rc == -ESHUTDOWN || rc == -EREMCHG ||
git://git.whamcloud.com / fs / lustre-release.git / blobdiff