struct lfsck_assistant_req *lar)
{
struct lfsck_namespace_req *lnr =
- container_of0(lar, struct lfsck_namespace_req, lnr_lar);
+ container_of(lar, struct lfsck_namespace_req, lnr_lar);
if (lnr->lnr_lmv != NULL)
lfsck_lmv_put(env, lnr->lnr_lmv);
if (unlikely(lfsck_is_dead_obj(obj)))
RETURN(LFSCK_NAMEENTRY_DEAD);
- rc = dt_lookup(env, dir, (struct dt_rec *)fid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, dir, name, fid);
if (rc == -ENOENT)
RETURN(LFSCK_NAMEENTRY_REMOVED);
do {
namelen = snprintf(info->lti_key, NAME_MAX, DFID"%s-%s-%d",
PFID(cfid), infix, type, idx++);
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)info->lti_key);
+ rc = dt_lookup_dir(env, parent, info->lti_key, &tfid);
if (rc != 0 && rc != -ENOENT)
GOTO(log, rc);
/* Re-check whether the name conflict with othrs after taken
* the ldlm lock. */
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)info->lti_key);
+ rc = dt_lookup_dir(env, parent, info->lti_key, &tfid);
if (rc == 0) {
if (!lu_fid_eq(cfid, &tfid)) {
exist = false;
return rc;
}
+static int lfsck_lmv_set(const struct lu_env *env,
+ struct lfsck_instance *lfsck,
+ struct dt_object *obj,
+ struct lmv_mds_md_v1 *lmv)
+{
+ struct dt_device *dev = lfsck->li_next;
+ struct thandle *th = NULL;
+ struct lu_buf buf = { lmv, sizeof(*lmv) };
+ int rc;
+
+ ENTRY;
+
+ th = dt_trans_create(env, dev);
+ if (IS_ERR(th))
+ RETURN(PTR_ERR(th));
+
+ rc = dt_declare_xattr_set(env, obj, &buf, XATTR_NAME_LMV, 0, th);
+ if (rc)
+ GOTO(stop, rc);
+
+ rc = dt_trans_start_local(env, dev, th);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ rc = dt_xattr_set(env, obj, &buf, XATTR_NAME_LMV, 0, th);
+ if (rc)
+ GOTO(stop, rc);
+
+ EXIT;
+stop:
+ dt_trans_stop(env, dev, th);
+
+ return rc;
+}
+
+static int lfsck_lmv_delete(const struct lu_env *env,
+ struct lfsck_instance *lfsck,
+ struct dt_object *obj)
+{
+ struct dt_device *dev = lfsck->li_next;
+ struct thandle *th = NULL;
+ int rc;
+
+ ENTRY;
+
+ th = dt_trans_create(env, dev);
+ if (IS_ERR(th))
+ RETURN(PTR_ERR(th));
+
+ rc = dt_declare_xattr_del(env, obj, XATTR_NAME_LMV, th);
+ if (rc)
+ GOTO(stop, rc);
+
+ rc = dt_trans_start_local(env, dev, th);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ rc = dt_xattr_del(env, obj, XATTR_NAME_LMV, th);
+ if (rc)
+ GOTO(stop, rc);
+
+ EXIT;
+stop:
+ dt_trans_stop(env, dev, th);
+
+ return rc;
+}
+
+static inline int lfsck_object_is_shard(const struct lu_env *env,
+ struct lfsck_instance *lfsck,
+ struct dt_object *obj,
+ const struct lu_name *lname)
+{
+ struct lfsck_thread_info *info = lfsck_env_info(env);
+ struct lmv_mds_md_v1 *lmv = &info->lti_lmv;
+ int rc;
+
+ rc = lfsck_shard_name_to_index(env, lname->ln_name, lname->ln_namelen,
+ lfsck_object_type(obj),
+ lfsck_dto2fid(obj));
+ if (rc < 0)
+ return 0;
+
+ rc = lfsck_read_stripe_lmv(env, lfsck, obj, lmv);
+ if (rc == -ENODATA)
+ return 0;
+
+ if (!rc && lmv->lmv_magic == LMV_MAGIC_STRIPE)
+ return 1;
+
+ return rc;
+}
+
/**
* Add the specified name entry back to namespace.
*
* it is quite possible that the name entry is lost. Then the LFSCK
* should add the name entry back to the namespace.
*
+ * If \a child is shard, which means \a parent is a striped directory,
+ * if \a parent has LMV, we need to delete it before insertion because
+ * now parent's striping is broken and can't be parsed correctly.
+ *
* \param[in] env pointer to the thread context
* \param[in] com pointer to the lfsck component
* \param[in] parent pointer to the directory under which the name entry
* will be inserted into
* \param[in] child pointer to the object referenced by the name entry
* that to be inserted into the parent
- * \param[in] name the name for the child in the parent directory
+ * \param[in] lname the name for the child in the parent directory
*
* \retval positive number for repaired cases
* \retval 0 if nothing to be repaired
struct lfsck_component *com,
struct dt_object *parent,
struct dt_object *child,
- const char *name)
+ const struct lu_name *lname)
{
- struct lfsck_thread_info *info = lfsck_env_info(env);
- struct lu_attr *la = &info->lti_la;
- struct dt_insert_rec *rec = &info->lti_dt_rec;
- struct lfsck_instance *lfsck = com->lc_lfsck;
+ struct lfsck_thread_info *info = lfsck_env_info(env);
+ struct lu_attr *la = &info->lti_la;
+ struct dt_insert_rec *rec = &info->lti_dt_rec;
+ struct lfsck_instance *lfsck = com->lc_lfsck;
/* The child and its name may be on different MDTs. */
- const struct lu_fid *pfid = lfsck_dto2fid(parent);
- const struct lu_fid *cfid = lfsck_dto2fid(child);
- struct dt_device *dev = lfsck->li_next;
- struct thandle *th = NULL;
- struct lfsck_lock_handle *llh = &info->lti_llh;
- int rc = 0;
+ const struct lu_fid *pfid = lfsck_dto2fid(parent);
+ const struct lu_fid *cfid = lfsck_dto2fid(child);
+ struct dt_device *dev = lfsck->li_next;
+ struct thandle *th = NULL;
+ struct lfsck_lock_handle *llh = &info->lti_llh;
+ struct lmv_mds_md_v1 *lmv = &info->lti_lmv;
+ struct lu_buf buf = { lmv, sizeof(*lmv) };
+ /* whether parent's LMV is deleted before insertion */
+ bool parent_lmv_deleted = false;
+ /* whether parent's LMV is missing */
+ bool parent_lmv_lost = false;
+ int rc = 0;
+
ENTRY;
/* @parent/@child may be based on lfsck->li_bottom,
if (IS_ERR(parent))
GOTO(log, rc = PTR_ERR(parent));
- if (unlikely(!dt_try_as_dir(env, parent)))
- GOTO(log, rc = -ENOTDIR);
-
child = lfsck_object_locate(dev, child);
if (IS_ERR(child))
GOTO(log, rc = PTR_ERR(child));
if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
GOTO(log, rc = 1);
- rc = lfsck_lock(env, lfsck, parent, name, llh,
- MDS_INODELOCK_UPDATE, LCK_PW);
- if (rc != 0)
+ rc = lfsck_lock(env, lfsck, parent, lname->ln_name, llh,
+ MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE |
+ MDS_INODELOCK_XATTR, LCK_EX);
+ if (rc)
GOTO(log, rc);
+ rc = lfsck_object_is_shard(env, lfsck, child, lname);
+ if (rc < 0)
+ GOTO(unlock, rc);
+
+ if (rc == 1) {
+ rc = lfsck_read_stripe_lmv(env, lfsck, parent, lmv);
+ if (!rc) {
+ /*
+ * To add a shard, we need to convert parent to a
+ * plain directory by deleting its LMV, and after
+ * insertion set it back.
+ */
+ rc = lfsck_lmv_delete(env, lfsck, parent);
+ if (rc)
+ GOTO(unlock, rc);
+ parent_lmv_deleted = true;
+ lmv->lmv_layout_version++;
+ lfsck_lmv_header_cpu_to_le(lmv, lmv);
+ } else if (rc == -ENODATA) {
+ struct lu_seq_range *range = &info->lti_range;
+ struct seq_server_site *ss = lfsck_dev_site(lfsck);
+
+ rc = lfsck_read_stripe_lmv(env, lfsck, child, lmv);
+ if (rc)
+ GOTO(unlock, rc);
+
+ fld_range_set_mdt(range);
+ rc = fld_server_lookup(env, ss->ss_server_fld,
+ fid_seq(lfsck_dto2fid(parent)), range);
+ if (rc)
+ GOTO(unlock, rc);
+
+ parent_lmv_lost = true;
+ lmv->lmv_magic = LMV_MAGIC;
+ lmv->lmv_master_mdt_index = range->lsr_index;
+ lmv->lmv_layout_version++;
+ lfsck_lmv_header_cpu_to_le(lmv, lmv);
+ } else {
+ GOTO(unlock, rc);
+ }
+ }
+
+ if (unlikely(!dt_try_as_dir(env, parent)))
+ GOTO(unlock, rc = -ENOTDIR);
+
th = dt_trans_create(env, dev);
if (IS_ERR(th))
GOTO(unlock, rc = PTR_ERR(th));
rec->rec_type = lfsck_object_type(child) & S_IFMT;
rec->rec_fid = cfid;
rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
- (const struct dt_key *)name, th);
+ (const struct dt_key *)lname->ln_name, th);
if (rc != 0)
GOTO(stop, rc);
GOTO(stop, rc);
}
- memset(la, 0, sizeof(*la));
+ if (parent_lmv_lost) {
+ rc = dt_declare_xattr_set(env, parent, &buf, XATTR_NAME_LMV,
+ 0, th);
+ if (rc)
+ GOTO(stop, rc);
+ }
+
la->la_ctime = ktime_get_real_seconds();
la->la_valid = LA_CTIME;
rc = dt_declare_attr_set(env, parent, la, th);
GOTO(stop, rc);
rc = dt_insert(env, parent, (const struct dt_rec *)rec,
- (const struct dt_key *)name, th);
+ (const struct dt_key *)lname->ln_name, th);
if (rc != 0)
GOTO(stop, rc);
GOTO(stop, rc);
}
- la->la_ctime = ktime_get_real_seconds();
+ if (parent_lmv_lost) {
+ rc = dt_xattr_set(env, parent, &buf, XATTR_NAME_LMV, 0, th);
+ if (rc)
+ GOTO(stop, rc);
+ }
+
rc = dt_attr_set(env, parent, la, th);
if (rc != 0)
GOTO(stop, rc);
dt_trans_stop(env, dev, th);
unlock:
+ if (parent_lmv_deleted)
+ lfsck_lmv_set(env, lfsck, parent, lmv);
+
lfsck_unlock(llh);
log:
CDEBUG(D_LFSCK, "%s: namespace LFSCK insert object "DFID" with "
"the name %s and type %o to the parent "DFID": rc = %d\n",
- lfsck_lfsck2name(lfsck), PFID(cfid), name,
+ lfsck_lfsck2name(lfsck), PFID(cfid), lname->ln_name,
lfsck_object_type(child) & S_IFMT, PFID(pfid), rc);
if (rc != 0) {
GOTO(log, rc = idx);
snprintf(name, 8, "MDT%04x", idx);
- rc = dt_lookup(env, lfsck->li_lpf_root_obj,
- (struct dt_rec *)&tfid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, lfsck->li_lpf_root_obj, name, &tfid);
if (rc != 0)
GOTO(log, rc = (rc == -ENOENT ? -ENXIO : rc));
do {
namelen = snprintf(name, 31, DFID"-P-%d",
PFID(cfid), idx++);
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, parent, name, &tfid);
if (rc != 0 && rc != -ENOENT)
GOTO(log, rc);
} while (rc == 0);
/* Re-check whether the name conflict with othrs after taken
* the ldlm lock. */
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, parent, name, &tfid);
if (unlikely(rc == 0)) {
lfsck_unlock(llh);
goto again;
lmv->lmv_master_mdt_index = lfsck_dev_idx(lfsck);
lfsck_lmv_header_cpu_to_le(lmv2, lmv);
lfsck_buf_init(&lmv_buf, lmv2, sizeof(*lmv2));
- rc = dt_declare_xattr_set(env, orphan, &lmv_buf,
- XATTR_NAME_LMV, 0, th);
+ rc = dt_declare_xattr_set(env, orphan, &lmv_buf, XATTR_NAME_LMV,
+ 0, th);
if (rc != 0)
GOTO(stop, rc);
}
goto replace;
}
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, parent, name, &tfid);
if (rc == -ENOENT) {
exist = false;
goto replace;
dt_write_lock(env, parent, 0);
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)name);
+ rc = dt_lookup_dir(env, dt_object_child(parent), name, &tfid);
/* Someone has removed the bad name entry by race. */
if (rc == -ENOENT)
GOTO(unlock2, rc = 0);
if (rc >= 0) {
/* Add the missing name entry to the parent. */
rc = lfsck_namespace_insert_normal(env, com, parent,
- child, cname->ln_name);
+ child, cname);
if (unlikely(rc == -EEXIST)) {
/* Unfortunately, someone reused the name
* under the parent by race. So we have
GOTO(out, rc);
}
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)cname->ln_name);
+ rc = dt_lookup_dir(env, parent, cname->ln_name, &tfid);
if (rc == -ENOENT) {
/* If the LFSCK is marked as LF_INCOMPLETE, then means some MDT
* has ever tried to verify some remote MDT-object that resides
/* Add the missing name entry back to the namespace. */
rc = lfsck_namespace_insert_normal(env, com, parent, child,
- cname->ln_name);
+ cname);
if (unlikely(rc == -ESTALE))
/* It may happen when the remote object has been
* removed, but the local MDT is not aware of that. */
continue;
}
- rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
- (const struct dt_key *)cname->ln_name);
+ rc = dt_lookup_dir(env, parent, cname->ln_name, &tfid);
*pfid2 = *lfsck_dto2fid(parent);
if (rc == -ENOENT) {
lfsck_object_put(env, parent);
if (flags & (LNTF_CHECK_LINKEA | LNTF_CHECK_PARENT) &&
!(lfsck->li_bookmark_ram.lb_param & LPF_ALL_TGT)) {
- CDEBUG(D_LFSCK, "%s: some MDT(s) maybe NOT take part in the"
- "the namespace LFSCK, then the LFSCK cannot guarantee"
- "all the name entries have been verified in first-stage"
- "scanning. So have to skip orphan related handling for"
- "the directory object "DFID" with remote name entry\n",
+ CDEBUG(D_LFSCK,
+ "%s: some MDT(s) maybe NOT take part in the the namespace LFSCK, then the LFSCK cannot guarantee all the name entries have been verified in first-stage scanning. So have to skip orphan related handling for the directory object "DFID" with remote name entry\n",
lfsck_lfsck2name(lfsck), PFID(cfid));
RETURN(0);
GOTO(out, rc = 0);
}
- rc = dt_lookup(env, child, (struct dt_rec *)pfid,
- (const struct dt_key *)dotdot);
+ rc = dt_lookup_dir(env, child, dotdot, pfid);
if (rc != 0) {
if (rc != -ENOENT && rc != -ENODATA && rc != -EINVAL) {
dt_read_unlock(env, child);
/* Add the missing name entry to the parent. */
rc = lfsck_namespace_insert_normal(env, com,
- parent, child, cname->ln_name);
+ parent, child, cname);
if (unlikely(rc == -EEXIST))
/* Unfortunately, someone reused the
* name under the parent by race. So we
continue;
}
- rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
- (const struct dt_key *)cname->ln_name);
+ rc = dt_lookup_dir(env, parent, cname->ln_name, cfid);
if (rc != 0 && rc != -ENOENT) {
lfsck_object_put(env, parent);
/* Add the missing name entry back to the namespace. */
rc = lfsck_namespace_insert_normal(env, com, parent, child,
- cname->ln_name);
+ cname);
if (unlikely(rc == -ESTALE))
/* It may happen when the remote object has been
* removed, but the local MDT is not aware of that. */
struct lfsck_component *com,
struct dt_object *obj)
{
- struct lfsck_thread_info *info = lfsck_env_info(env);
- struct lfsck_namespace *ns = com->lc_file_ram;
- struct lfsck_instance *lfsck = com->lc_lfsck;
- const struct lu_fid *fid = lfsck_dto2fid(obj);
- struct lu_fid *pfid = &info->lti_fid2;
- struct lu_name *cname = &info->lti_name;
- struct lu_seq_range *range = &info->lti_range;
- struct seq_server_site *ss = lfsck_dev_site(lfsck);
- struct linkea_data ldata = { NULL };
- __u32 idx = lfsck_dev_idx(lfsck);
- int rc;
+ struct lfsck_thread_info *info = lfsck_env_info(env);
+ struct lfsck_namespace *ns = com->lc_file_ram;
+ struct lfsck_instance *lfsck = com->lc_lfsck;
+ const struct lu_fid *fid = lfsck_dto2fid(obj);
+ struct lu_fid *pfid = &info->lti_fid2;
+ struct lu_name *cname = &info->lti_name;
+ struct lu_seq_range *range = &info->lti_range;
+ struct seq_server_site *ss = lfsck_dev_site(lfsck);
+ struct linkea_data ldata = { NULL };
+ __u32 idx = lfsck_dev_idx(lfsck);
+ struct lu_attr la = { .la_valid = 0 };
bool remote = false;
+ int rc;
ENTRY;
+ rc = dt_attr_get(env, obj, &la);
+ if (unlikely(rc || (la.la_valid & LA_FLAGS &&
+ la.la_flags & LUSTRE_ORPHAN_FL))) {
+ CDEBUG(D_INFO,
+ "%s: skip orphan "DFID", %llx/%x: rc = %d\n",
+ lfsck_lfsck2name(lfsck), PFID(fid),
+ la.la_valid, la.la_flags, rc);
+
+ return rc;
+ }
+
rc = lfsck_links_read(env, obj, &ldata);
if (rc == -ENOENT)
GOTO(out, rc = 0);
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct ptlrpc_thread *mthread = &lfsck->li_thread;
struct ptlrpc_thread *athread = &lad->lad_thread;
- struct l_wait_info lwi = { 0 };
bool wakeup = false;
- l_wait_event(mthread->t_ctl_waitq,
- lad->lad_prefetched < bk->lb_async_windows ||
- !thread_is_running(mthread) ||
- !thread_is_running(athread),
- &lwi);
+ wait_event_idle(mthread->t_ctl_waitq,
+ lad->lad_prefetched < bk->lb_async_windows ||
+ !thread_is_running(mthread) ||
+ !thread_is_running(athread));
if (unlikely(!thread_is_running(mthread) ||
!thread_is_running(athread)))
return rc;
}
-static struct lfsck_operations lfsck_namespace_ops = {
+static const struct lfsck_operations lfsck_namespace_ops = {
.lfsck_reset = lfsck_namespace_reset,
.lfsck_fail = lfsck_namespace_fail,
.lfsck_close_dir = lfsck_namespace_close_dir,
*/
if (S_ISREG(type))
child->do_ops->do_ah_init(env, hint, parent, child, type);
+ else if (S_ISDIR(type))
+ child->do_ops->do_ah_init(env, hint, NULL, child, type);
memset(dof, 0, sizeof(*dof));
dof->dof_type = dt_mode_to_dft(type);
lfsck_lmv_header_cpu_to_le(lmv2, lmv2);
lfsck_buf_init(&lmv_buf, lmv2, sizeof(*lmv2));
rc = dt_declare_xattr_set(env, child, &lmv_buf,
- XATTR_NAME_LMV".set", 0, th);
+ XATTR_NAME_LMV, 0, th);
if (rc != 0)
GOTO(stop, rc);
}
/* 5b. generate slave LMV EA. */
if (lnr->lnr_lmv != NULL && lnr->lnr_lmv->ll_lmv_master) {
- rc = dt_xattr_set(env, child, &lmv_buf,
- XATTR_NAME_LMV".set", 0, th);
+ rc = dt_xattr_set(env, child, &lmv_buf, XATTR_NAME_LMV,
+ 0, th);
if (rc != 0)
GOTO(unlock, rc);
}
const struct lu_name *cname;
struct thandle *handle = NULL;
struct lfsck_namespace_req *lnr =
- container_of0(lar, struct lfsck_namespace_req, lnr_lar);
+ container_of(lar, struct lfsck_namespace_req, lnr_lar);
struct dt_object *dir = NULL;
struct dt_object *obj = NULL;
struct lfsck_assistant_object *lso = lar->lar_parent;
repaired = true;
}
- if (unlikely(fid_is_zero(&lnr->lnr_fid))) {
- if (strcmp(lnr->lnr_name, dotdot) != 0)
- LBUG();
- else
- rc = lfsck_namespace_trace_update(env, com, pfid,
+ if (unlikely(fid_is_zero(&lnr->lnr_fid) &&
+ strcmp(lnr->lnr_name, dotdot) == 0)) {
+ rc = lfsck_namespace_trace_update(env, com, pfid,
LNTF_CHECK_PARENT, true);
GOTO(out, rc);
EXIT;
}
-struct lfsck_assistant_operations lfsck_namespace_assistant_ops = {
+const struct lfsck_assistant_operations lfsck_namespace_assistant_ops = {
.la_handler_p1 = lfsck_namespace_assistant_handler_p1,
.la_handler_p2 = lfsck_namespace_assistant_handler_p2,
.la_fill_pos = lfsck_namespace_assistant_fill_pos,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff