* \param[in] del_lmv true if need to drop the LMV EA
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
static int lfsck_disable_master_lmv(const struct lu_env *env,
* striped directory to be handled and other information
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
static int lfsck_remove_lmv(const struct lu_env *env,
* \param[in] index the old shard's index in the striped directory
* \param[in] flags the new shard's flags in the @lslr slot
*
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
static int lfsck_replace_lmv(const struct lu_env *env,
* we define the max depth can be called recursively
* (LFSCK_REC_LMV_MAX_DEPTH)
*
- * \retval zero for succeed
+ * \retval zero for success
* \retval "-ERANGE" for invalid @shard_idx
* \retval "-EEXIST" for the required lslr slot has been
* occupied by other shard
* \param[in] index the MDT index on which the LFSCK instance to be notified
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
static int lfsck_namespace_notify_lmv_remote(const struct lu_env *env,
* \param[in] obj pointer to the striped directory to be rescanned
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
* \param[in] flags to indicate which element(s) in the LMV EA will be set
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
static int lfsck_namespace_set_lmv_master(const struct lu_env *env,
* \param[in] name the name of the bad name hash
*
* \retval positive number if nothing to be done
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
if (IS_ERR(parent))
GOTO(log, rc = PTR_ERR(parent));
+ if (unlikely(!dt_object_exists(parent)))
+ /* The parent object was previously accessed when verifying
+ * the slave LMV EA. If this condition is true it is because
+ * the striped directory is being removed. */
+ GOTO(log, rc = 1);
+
*lmv2 = llmv->ll_lmv;
lmv2->lmv_hash_type = LMV_HASH_TYPE_UNKNOWN | LMV_HASH_FLAG_BAD_TYPE;
rc = lfsck_namespace_set_lmv_master(env, com, parent, lmv2,
ns->ln_flags |= LF_INCONSISTENT;
rc = lfsck_namespace_repair_bad_name_hash(env, com,
child, llmv, ent->lde_name);
- if (rc >= 0)
+ if (rc == 0)
ns->ln_name_hash_repaired++;
}
* \param[in] obj pointer to the object which LMV EA will be checked
* \param[in] llmv pointer to buffer holding the slave LMV EA
*
- * \retval zero for succeed
+ * \retval positive number if nothing to be done
+ * \retval zero for success
* \retval negative error number on failure
*/
int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
GOTO(out, rc);
}
+ if (unlikely(!dt_object_exists(parent)))
+ GOTO(out, rc = 1);
+
if (unlikely(!dt_try_as_dir(env, parent)))
GOTO(out, rc = -ENOTDIR);
*
* \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
*
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
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;
- const struct lu_fid *pfid = lfsck_dto2fid(dir);
+ struct lfsck_assistant_object *lso = lnr->lnr_lar.lar_parent;
+ const struct lu_fid *pfid = &lso->lso_fid;
+ struct dt_object *dir = NULL;
+ struct dt_object *obj = NULL;
struct lu_seq_range *range = &info->lti_range;
struct seq_server_site *ss = lfsck_dev_site(lfsck);
__u32 stripe_count;
if (llmv->ll_lmv_slave) {
if (llmv->ll_lmv_verified) {
ns->ln_striped_shards_scanned++;
- lfsck_namespace_trace_update(env, com,
- lfsck_dto2fid(dir),
+ lfsck_namespace_trace_update(env, com, pfid,
LNTF_UNCERTAIN_LMV |
LNTF_RECHECK_NAME_HASH, false);
}
}
if (llmv->ll_lmv_updated) {
+ if (dir == NULL) {
+ dir = lfsck_assistant_object_load(env, lfsck, lso);
+ if (IS_ERR(dir)) {
+ rc = PTR_ERR(dir);
+
+ RETURN(rc == -ENOENT ? 0 : rc);
+ }
+ }
+
lmv->lmv_layout_version++;
rc = lfsck_namespace_update_lmv(env, com, dir, lmv, false);
if (rc != 0)
fld_range_set_mdt(range);
for (i = 0; i <= llmv->ll_max_filled_off; i++) {
- struct dt_object *obj = NULL;
struct lfsck_slave_lmv_rec *lslr = llmv->ll_lslr + i;
const struct lu_fid *cfid = &lslr->lslr_fid;
const struct lu_name *cname;
obj = lfsck_object_find_bottom_nowait(env, lfsck, cfid);
if (IS_ERR(obj)) {
- if (lfsck_is_dead_obj(dir))
- RETURN(0);
+ if (dir == NULL) {
+ dir = lfsck_assistant_object_load(env, lfsck,
+ lso);
+ if (IS_ERR(dir)) {
+ if (PTR_ERR(dir) == -ENOENT)
+ RETURN(0);
+
+ dir = NULL;
+ }
+ } else if (lfsck_is_dead_obj(dir)) {
+ GOTO(out, rc = 0);
+ }
rc1 = PTR_ERR(obj);
goto next;
repair:
if (create) {
+ if (dir == NULL) {
+ dir = lfsck_assistant_object_load(env, lfsck,
+ lso);
+ if (IS_ERR(dir)) {
+ rc1 = PTR_ERR(dir);
+
+ if (rc1 == -ENOENT)
+ GOTO(out, rc = 0);
+
+ dir = NULL;
+ goto next;
+ }
+ }
+
rc1 = lfsck_namespace_repair_dangling(env, com, dir,
obj, lnr);
if (rc1 >= 0) {
}
if (rename) {
+ if (dir == NULL) {
+ dir = lfsck_assistant_object_load(env, lfsck,
+ lso);
+ if (IS_ERR(dir)) {
+ rc1 = PTR_ERR(dir);
+
+ if (rc1 == -ENOENT)
+ GOTO(out, rc = 0);
+
+ dir = NULL;
+ goto next;
+ }
+ }
+
rc1 = lfsck_namespace_repair_dirent(env, com, dir, obj,
info->lti_tmpbuf2, lnr->lnr_name,
lnr->lnr_type, true, false);
if (rc1 != 0)
goto next;
+ if (dir == NULL) {
+ dir = lfsck_assistant_object_load(env, lfsck,
+ lso);
+ if (IS_ERR(dir)) {
+ rc1 = PTR_ERR(dir);
+
+ if (rc1 == -ENOENT)
+ GOTO(out, rc = 0);
+
+ dir = NULL;
+ goto next;
+ }
+ }
+
rc1 = linkea_add_buf(&ldata, cname, lfsck_dto2fid(dir));
if (rc1 != 0)
goto next;
repair_lmvea ? "yes" : "no",
lmvea_repaired ? "yes" : "no", rc1);
- if (obj != NULL && !IS_ERR(obj))
+ if (obj != NULL && !IS_ERR(obj)) {
lfsck_object_put(env, obj);
+ obj = NULL;
+ }
if (rc1 < 0) {
rc = rc1;
}
}
- RETURN(rc);
+ GOTO(out, rc);
+
+out:
+ if (obj != NULL && !IS_ERR(obj))
+ lfsck_object_put(env, obj);
+
+ if (dir != NULL && !IS_ERR(dir))
+ lfsck_object_put(env, dir);
+
+ return rc;
}
/**
*
* \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.
*
- * \retval zero for succeed
+ * \retval zero for success
* \retval negative error number on failure
*/
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;
- const struct lu_fid *pfid = lfsck_dto2fid(dir);
+ struct lfsck_assistant_object *lso = lnr->lnr_lar.lar_parent;
+ const struct lu_fid *pfid = &lso->lso_fid;
+ struct dt_object *dir;
struct dt_object *obj = NULL;
struct dt_device *dev = NULL;
int shard_idx = 0;
if (unlikely(llmv->ll_ignore))
RETURN(0);
+ dir = lfsck_assistant_object_load(env, lfsck, lso);
+ if (IS_ERR(dir)) {
+ rc = PTR_ERR(dir);
+
+ RETURN(rc == -ENOENT ? 0 : rc);
+ }
+
shard_idx = lfsck_find_mdt_idx_by_fid(env, lfsck, &lnr->lnr_fid);
if (shard_idx < 0)
GOTO(fail_lmv, rc = shard_idx);
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(dir)),
- lnr->lnr_namelen, lnr->lnr_name, rc);
+ PFID(pfid), lnr->lnr_namelen, lnr->lnr_name, rc);
if ((rc == -ENOTCONN || rc == -ESHUTDOWN || rc == -EREMCHG ||
rc == -ETIMEDOUT || rc == -EHOSTDOWN ||
if (obj != NULL && !IS_ERR(obj))
lfsck_object_put(env, obj);
+ lfsck_object_put(env, dir);
+
return rc;
}