* GPL HEADER END
*/
/*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
*/
/*
* lustre/lfsck/lfsck_namespace.c
dst->ln_local_lpf_skipped = le64_to_cpu(src->ln_local_lpf_skipped);
dst->ln_local_lpf_failed = le64_to_cpu(src->ln_local_lpf_failed);
dst->ln_bitmap_size = le32_to_cpu(src->ln_bitmap_size);
+ dst->ln_time_latest_reset = le32_to_cpu(src->ln_time_latest_reset);
+ dst->ln_linkea_overflow_cleared =
+ le64_to_cpu(src->ln_linkea_overflow_cleared);
}
static void lfsck_namespace_cpu_to_le(struct lfsck_namespace *dst,
dst->ln_local_lpf_skipped = cpu_to_le64(src->ln_local_lpf_skipped);
dst->ln_local_lpf_failed = cpu_to_le64(src->ln_local_lpf_failed);
dst->ln_bitmap_size = cpu_to_le32(src->ln_bitmap_size);
+ dst->ln_time_latest_reset = cpu_to_le32(src->ln_time_latest_reset);
+ dst->ln_linkea_overflow_cleared =
+ cpu_to_le64(src->ln_linkea_overflow_cleared);
}
static void lfsck_namespace_record_failure(const struct lu_env *env,
ns->ln_pos_first_inconsistent = pos;
CDEBUG(D_LFSCK, "%s: namespace LFSCK hit first non-repaired "
- "inconsistency at the pos ["LPU64", "DFID", "LPX64"]\n",
+ "inconsistency at the pos [%llu, "DFID", %#llx]\n",
lfsck_lfsck2name(lfsck),
ns->ln_pos_first_inconsistent.lp_oit_cookie,
PFID(&ns->ln_pos_first_inconsistent.lp_dir_parent),
return rc;
}
-static struct dt_object *
-lfsck_namespace_load_one_trace_file(const struct lu_env *env,
- struct lfsck_component *com,
- struct dt_object *parent,
- const char *name, bool reset)
-{
- struct lfsck_instance *lfsck = com->lc_lfsck;
- struct dt_object *obj;
- int rc;
-
- if (reset) {
- rc = local_object_unlink(env, lfsck->li_bottom, parent, name);
- if (rc != 0 && rc != -ENOENT)
- return ERR_PTR(rc);
- }
-
- obj = local_index_find_or_create(env, lfsck->li_los, parent, name,
- S_IFREG | S_IRUGO | S_IWUSR,
- &dt_lfsck_features);
-
- return obj;
-}
-
-static int lfsck_namespace_load_sub_trace_files(const struct lu_env *env,
- struct lfsck_component *com,
- bool reset)
-{
- char *name = lfsck_env_info(env)->lti_key;
- struct lfsck_sub_trace_obj *lsto;
- struct dt_object *obj;
- int rc;
- int i;
-
- for (i = 0, lsto = &com->lc_sub_trace_objs[0];
- i < LFSCK_STF_COUNT; i++, lsto++) {
- snprintf(name, NAME_MAX, "%s_%02d", LFSCK_NAMESPACE, i);
- if (lsto->lsto_obj != NULL) {
- if (!reset)
- continue;
-
- lfsck_object_put(env, lsto->lsto_obj);
- lsto->lsto_obj = NULL;
- }
-
- obj = lfsck_namespace_load_one_trace_file(env, com,
- com->lc_lfsck->li_lfsck_dir, name, reset);
- if (IS_ERR(obj))
- return PTR_ERR(obj);
-
- lsto->lsto_obj = obj;
- rc = obj->do_ops->do_index_try(env, obj, &dt_lfsck_features);
- if (rc != 0)
- return rc;
- }
-
- return 0;
-}
-
static int lfsck_namespace_init(const struct lu_env *env,
struct lfsck_component *com)
{
memset(ns, 0, sizeof(*ns));
ns->ln_magic = LFSCK_NAMESPACE_MAGIC;
ns->ln_status = LS_INIT;
+ ns->ln_time_latest_reset = cfs_time_current_sec();
down_write(&com->lc_sem);
rc = lfsck_namespace_store(env, com);
- up_write(&com->lc_sem);
if (rc == 0)
- rc = lfsck_namespace_load_sub_trace_files(env, com, true);
+ rc = lfsck_load_sub_trace_files(env, com,
+ &dt_lfsck_namespace_features, LFSCK_NAMESPACE, true);
+ up_write(&com->lc_sem);
return rc;
}
RETURN(0);
idx = lfsck_sub_trace_file_fid2idx(fid);
+ mutex_lock(&com->lc_sub_trace_objs[idx].lsto_mutex);
obj = com->lc_sub_trace_objs[idx].lsto_obj;
+ if (unlikely(obj == NULL)) {
+ mutex_unlock(&com->lc_sub_trace_objs[idx].lsto_mutex);
+ RETURN(0);
+ }
+
+ lfsck_object_get(obj);
dev = lfsck_obj2dev(obj);
- mutex_lock(&com->lc_sub_trace_objs[idx].lsto_mutex);
fid_cpu_to_be(key, fid);
rc = dt_lookup(env, obj, (struct dt_rec *)&old,
(const struct dt_key *)key);
unlock:
mutex_unlock(&com->lc_sub_trace_objs[idx].lsto_mutex);
+ lfsck_object_put(env, obj);
return rc;
}
{
int rc;
+ /* For remote updating LINKEA, there may be further LFSCK action
+ * on remote MDT after the updating, so update the LINKEA ASAP. */
+ if (dt_object_remote(obj))
+ handle->th_sync = 1;
+
/* For destroying all invalid linkEA entries. */
rc = dt_declare_xattr_del(env, obj, XATTR_NAME_LINK, handle);
- if (rc != 0)
- return rc;
-
- /* For insert new linkEA entry. */
- rc = dt_declare_xattr_set(env, obj,
- lfsck_buf_get_const(env, NULL, DEFAULT_LINKEA_SIZE),
+ if (rc == 0)
+ /* For insert new linkEA entry. */
+ rc = dt_declare_xattr_set(env, obj,
+ lfsck_buf_get_const(env, NULL, MAX_LINKEA_SIZE),
XATTR_NAME_LINK, 0, handle);
return rc;
}
int __lfsck_links_read(const struct lu_env *env, struct dt_object *obj,
- struct linkea_data *ldata)
+ struct linkea_data *ldata, bool with_rec)
{
int rc;
if (rc == -ERANGE) {
/* Buf was too small, figure out what we need. */
rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LINK);
- if (rc <= 0)
+ if (unlikely(rc == 0))
+ return -ENODATA;
+
+ if (rc < 0)
return rc;
lu_buf_realloc(ldata->ld_buf, rc);
rc = dt_xattr_get(env, obj, ldata->ld_buf, XATTR_NAME_LINK);
}
- if (rc > 0)
- rc = linkea_init(ldata);
+ if (unlikely(rc == 0))
+ return -ENODATA;
+
+ if (rc > 0) {
+ if (with_rec)
+ rc = linkea_init_with_rec(ldata);
+ else
+ rc = linkea_init(ldata);
+ }
return rc;
}
static int lfsck_links_write(const struct lu_env *env, struct dt_object *obj,
struct linkea_data *ldata, struct thandle *handle)
{
- const struct lu_buf *buf = lfsck_buf_get_const(env,
- ldata->ld_buf->lb_buf,
- ldata->ld_leh->leh_len);
+ struct lu_buf buf;
+ int rc;
+
+ lfsck_buf_init(&buf, ldata->ld_buf->lb_buf, ldata->ld_leh->leh_len);
+
+again:
+ rc = dt_xattr_set(env, obj, &buf, XATTR_NAME_LINK, 0, handle);
+ if (unlikely(rc == -ENOSPC)) {
+ rc = linkea_overflow_shrink(ldata);
+ if (likely(rc > 0)) {
+ buf.lb_len = rc;
+ goto again;
+ }
+ }
- return dt_xattr_set(env, obj, buf, XATTR_NAME_LINK, 0, handle);
+ return rc;
}
-static void lfsck_namespace_unpack_linkea_entry(struct linkea_data *ldata,
- struct lu_name *cname,
- struct lu_fid *pfid,
- char *buf)
+static int lfsck_namespace_unpack_linkea_entry(struct linkea_data *ldata,
+ struct lu_name *cname,
+ struct lu_fid *pfid,
+ char *buf, const int buflen)
{
linkea_entry_unpack(ldata->ld_lee, &ldata->ld_reclen, cname, pfid);
+ if (unlikely(ldata->ld_reclen <= 0 ||
+ ldata->ld_reclen + sizeof(struct link_ea_header) >
+ ldata->ld_leh->leh_len ||
+ cname->ln_namelen <= 0 ||
+ cname->ln_namelen > NAME_MAX ||
+ cname->ln_namelen >= buflen ||
+ !fid_is_sane(pfid)))
+ return -EINVAL;
+
/* To guarantee the 'name' is terminated with '0'. */
memcpy(buf, cname->ln_name, cname->ln_namelen);
buf[cname->ln_namelen] = 0;
cname->ln_name = buf;
+
+ return 0;
+}
+
+static void lfsck_linkea_del_buf(struct linkea_data *ldata,
+ const struct lu_name *lname)
+{
+ LASSERT(ldata->ld_leh != NULL && ldata->ld_lee != NULL);
+
+ /* If current record is corrupted, all the subsequent
+ * records will be dropped. */
+ if (unlikely(ldata->ld_reclen <= 0 ||
+ ldata->ld_reclen + sizeof(struct link_ea_header) >
+ ldata->ld_leh->leh_len)) {
+ void *ptr = ldata->ld_lee;
+
+ ldata->ld_leh->leh_len = sizeof(struct link_ea_header);
+ ldata->ld_leh->leh_reccount = 0;
+ linkea_first_entry(ldata);
+ while (ldata->ld_lee != NULL &&
+ (char *)ldata->ld_lee < (char *)ptr) {
+ int reclen = (ldata->ld_lee->lee_reclen[0] << 8) |
+ ldata->ld_lee->lee_reclen[1];
+
+ ldata->ld_leh->leh_len += reclen;
+ ldata->ld_leh->leh_reccount++;
+ ldata->ld_lee = (struct link_ea_entry *)
+ ((char *)ldata->ld_lee + reclen);
+ }
+
+ ldata->ld_lee = NULL;
+ } else {
+ linkea_del_buf(ldata, lname);
+ }
}
static int lfsck_namespace_filter_linkea_entry(struct linkea_data *ldata,
if (!remove)
break;
- linkea_del_buf(ldata, cname);
+ lfsck_linkea_del_buf(ldata, cname);
} else {
linkea_next_entry(ldata);
}
struct thandle *th = NULL;
struct lfsck_lock_handle *pllh = &info->lti_llh;
struct lustre_handle clh = { 0 };
- struct linkea_data ldata = { NULL };
+ struct linkea_data ldata2 = { NULL };
struct lu_buf linkea_buf;
int namelen;
int idx = 0;
cname->ln_name = info->lti_key;
cname->ln_namelen = namelen;
- rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
- if (rc != 0)
- GOTO(log, rc);
-
- rc = linkea_add_buf(&ldata, cname, pfid);
+ rc = linkea_links_new(&ldata2, &info->lti_linkea_buf2,
+ cname, pfid);
if (rc != 0)
GOTO(log, rc);
if (rc != 0)
GOTO(log, rc);
- lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
- ldata.ld_leh->leh_len);
+ lfsck_buf_init(&linkea_buf, ldata2.ld_buf->lb_buf,
+ ldata2.ld_leh->leh_len);
th = dt_trans_create(env, dev);
if (IS_ERR(th))
GOTO(log, rc = PTR_ERR(th));
GOTO(stop, rc);
dt_write_lock(env, orphan, 0);
- rc = lfsck_links_read(env, orphan, &ldata);
- if (likely((rc == -ENODATA) || (rc == -EINVAL) ||
- (rc == 0 && ldata.ld_leh->leh_reccount == 0))) {
+ rc = lfsck_links_read2_with_rec(env, orphan, &ldata2);
+ if (likely(rc == -ENODATA || rc == -EINVAL)) {
if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
GOTO(unlock, rc = 1);
th);
} else {
if (rc == 0 && count != NULL)
- *count = ldata.ld_leh->leh_reccount;
+ *count = ldata2.ld_leh->leh_reccount;
GOTO(unlock, rc);
}
memset(dof, 0, sizeof(*dof));
dof->dof_type = dt_mode_to_dft(S_IFDIR);
- rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
- if (rc != 0)
- GOTO(unlock1, rc);
-
- rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+ rc = linkea_links_new(&ldata, &info->lti_linkea_buf2,
+ cname, lfsck_dto2fid(parent));
if (rc != 0)
GOTO(unlock1, rc);
struct lustre_handle lh = { 0 };
struct linkea_data ldata_new = { NULL };
struct lu_buf linkea_buf;
+ int buflen = 0;
int rc = 0;
ENTRY;
GOTO(log, rc);
if (next)
- linkea_del_buf(ldata, cname);
+ lfsck_linkea_del_buf(ldata, cname);
else
lfsck_namespace_filter_linkea_entry(ldata, cname, pfid,
true);
- lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
- ldata->ld_leh->leh_len);
+ if (ldata->ld_leh->leh_reccount > 0 ||
+ unlikely(ldata->ld_leh->leh_overflow_time)) {
+ lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
+ ldata->ld_leh->leh_len);
+ buflen = linkea_buf.lb_len;
+ }
again:
th = dt_trans_create(env, dev);
if (IS_ERR(th))
GOTO(unlock1, rc = PTR_ERR(th));
- rc = dt_declare_xattr_set(env, obj, &linkea_buf,
- XATTR_NAME_LINK, 0, th);
+ if (buflen != 0)
+ rc = dt_declare_xattr_set(env, obj, &linkea_buf,
+ XATTR_NAME_LINK, 0, th);
+ else
+ rc = dt_declare_xattr_del(env, obj, XATTR_NAME_LINK, th);
if (rc != 0)
GOTO(stop, rc);
if (unlikely(lfsck_is_dead_obj(obj)))
GOTO(unlock2, rc = -ENOENT);
- rc = lfsck_links_read2(env, obj, &ldata_new);
- if (rc != 0)
- GOTO(unlock2, rc);
+ rc = lfsck_links_read2_with_rec(env, obj, &ldata_new);
+ if (rc)
+ GOTO(unlock2, rc = (rc == -ENODATA ? 0 : rc));
/* The specified linkEA entry has been removed by race. */
rc = linkea_links_find(&ldata_new, cname, pfid);
GOTO(unlock2, rc = 1);
if (next)
- linkea_del_buf(&ldata_new, cname);
+ lfsck_linkea_del_buf(&ldata_new, cname);
else
lfsck_namespace_filter_linkea_entry(&ldata_new, cname, pfid,
true);
- if (linkea_buf.lb_len < ldata_new.ld_leh->leh_len) {
+ if (buflen < ldata_new.ld_leh->leh_len) {
dt_write_unlock(env, obj);
dt_trans_stop(env, dev, th);
lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
goto again;
}
- lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
- ldata_new.ld_leh->leh_len);
- rc = dt_xattr_set(env, obj, &linkea_buf, XATTR_NAME_LINK, 0, th);
+ if (ldata_new.ld_leh->leh_reccount > 0 ||
+ unlikely(ldata->ld_leh->leh_overflow_time))
+ rc = lfsck_links_write(env, obj, &ldata_new, th);
+ else
+ rc = dt_xattr_del(env, obj, XATTR_NAME_LINK, th);
GOTO(unlock2, rc = (rc == 0 ? 1 : rc));
replace:
dt_read_lock(env, child, 0);
- rc = lfsck_links_read2(env, child, &ldata);
+ rc = lfsck_links_read2_with_rec(env, child, &ldata);
dt_read_unlock(env, child);
/* Someone changed the child, no need to replace. */
GOTO(stop, rc);
}
- if (dec) {
+ if (dec && S_ISDIR(type)) {
rc = dt_declare_ref_del(env, parent, th);
if (rc != 0)
GOTO(stop, rc);
GOTO(unlock2, rc);
}
- if (dec) {
+ if (dec && S_ISDIR(type)) {
rc = dt_ref_del(env, parent, th);
if (rc != 0)
GOTO(unlock2, rc);
LASSERT(!dt_object_remote(obj));
LASSERT(S_ISDIR(lfsck_object_type(obj)));
- rc = linkea_data_new(&ldata, &info->lti_big_buf);
- if (rc != 0)
- GOTO(log, rc);
-
- rc = linkea_add_buf(&ldata, cname, pfid);
+ rc = linkea_links_new(&ldata, &info->lti_big_buf, cname, pfid);
if (rc != 0)
GOTO(log, rc);
if (rc != 0)
GOTO(unlock, rc);
- rc = dt_xattr_set(env, obj, &linkea_buf,
- XATTR_NAME_LINK, 0, th);
+ rc = lfsck_links_write(env, obj, &ldata, th);
GOTO(unlock, rc = (rc == 0 ? 1 : rc));
* \param[out] type to tell the caller what the inconsistency is
* \param[in] retry if found inconsistency, but the caller does not hold
* ldlm lock on the @child, then set @retry as true
+ * \param[in] unknown set if does not know how to repair the inconsistency
*
* \retval positive number for repaired cases
* \retval 0 if nothing to be repaired
struct linkea_data *ldata,
struct lustre_handle *lh,
enum lfsck_namespace_inconsistency_type *type,
- bool *retry)
+ bool *retry, bool *unknown)
{
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lu_name *cname = &info->lti_name;
int rc = 0;
ENTRY;
- lfsck_namespace_unpack_linkea_entry(ldata, cname, &tfid, info->lti_key);
+ rc = lfsck_namespace_unpack_linkea_entry(ldata, cname, &tfid,
+ info->lti_key,
+ sizeof(info->lti_key));
/* The unique linkEA entry with bad parent will be handled as orphan. */
- if (!fid_is_sane(&tfid)) {
+ if (rc != 0) {
if (!lustre_handle_is_used(lh) && retry != NULL)
*retry = true;
else
}
GOTO(out, rc);
- }
+ } /* !dt_object_exists(parent) */
/* The unique linkEA entry with bad parent will be handled as orphan. */
if (unlikely(!dt_try_as_dir(env, parent))) {
}
GOTO(out, rc);
- }
+ } /* rc == -ENOENT */
if (rc != 0)
GOTO(out, rc);
GOTO(out, rc);
}
- if (fid_is_zero(pfid))
+ /* Zero FID may because the remote directroy object has invalid linkEA,
+ * or lost linkEA. Under such case, the LFSCK on this MDT does not know
+ * how to repair the inconsistency, but the namespace LFSCK on the MDT
+ * where its name entry resides may has more information (name, FID) to
+ * repair such inconsistency. So here, keep the inconsistency to avoid
+ * some imporper repairing. */
+ if (fid_is_zero(pfid)) {
+ if (unknown)
+ *unknown = true;
+
GOTO(out, rc = 0);
+ }
/* The ".." name entry is wrong, update it. */
if (!lu_fid_eq(pfid, lfsck_dto2fid(parent))) {
* \param[in,out] lh ldlm lock handler for the given @child
* \param[out] type to tell the caller what the inconsistency is
* \param[in] lpf true if the ".." entry is under lost+found/MDTxxxx/
+ * \param[in] unknown set if does not know how to repair the inconsistency
*
* \retval positive number for repaired cases
* \retval 0 if nothing to be repaired
struct linkea_data *ldata,
struct lustre_handle *lh,
enum lfsck_namespace_inconsistency_type *type,
- bool lpf)
+ bool lpf, bool *unknown)
{
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lu_name *cname = &info->lti_name;
struct dt_object *parent = NULL;
struct linkea_data ldata_new = { NULL };
int dirent_count = 0;
- int linkea_count = 0;
int rc = 0;
bool once = true;
ENTRY;
again:
while (ldata->ld_lee != NULL) {
- lfsck_namespace_unpack_linkea_entry(ldata, cname, &tfid,
- info->lti_key);
- /* Drop repeated linkEA entries. */
- lfsck_namespace_filter_linkea_entry(ldata, cname, &tfid, true);
+ rc = lfsck_namespace_unpack_linkea_entry(ldata, cname, &tfid,
+ info->lti_key,
+ sizeof(info->lti_key));
/* Drop invalid linkEA entry. */
- if (!fid_is_sane(&tfid)) {
- linkea_del_buf(ldata, cname);
- linkea_count++;
+ if (rc != 0) {
+ lfsck_linkea_del_buf(ldata, cname);
continue;
}
+ /* Drop repeated linkEA entries. */
+ lfsck_namespace_filter_linkea_entry(ldata, cname, &tfid, true);
+
/* If current dotdot is the .lustre/lost+found/MDTxxxx/,
* then it is possible that: the directry object has ever
* been lost, but its name entry was there. In the former
* When the LFSCK runs again, if the dangling name is still
* there, the LFSCK should move the orphan directory object
* back to the normal namespace. */
- if (!lpf && !lu_fid_eq(pfid, &tfid) && once) {
+ if (!lpf && !fid_is_zero(pfid) &&
+ !lu_fid_eq(pfid, &tfid) && once) {
linkea_next_entry(ldata);
continue;
}
* there is still other chance to make the
* child to be visible via other parent, then
* remove this linkEA entry. */
- linkea_del_buf(ldata, cname);
- linkea_count++;
+ lfsck_linkea_del_buf(ldata, cname);
continue;
}
/* The linkEA entry with bad parent will be removed. */
if (unlikely(!dt_try_as_dir(env, parent))) {
lfsck_object_put(env, parent);
- linkea_del_buf(ldata, cname);
- linkea_count++;
+ lfsck_linkea_del_buf(ldata, cname);
continue;
}
if (lu_fid_eq(&tfid, cfid)) {
lfsck_object_put(env, parent);
- if (!lu_fid_eq(pfid, pfid2)) {
+ /* If the parent (that is declared via linkEA entry)
+ * directory contains the specified child, but such
+ * parent does not match the dotdot name entry, then
+ * trust the linkEA. */
+ if (!fid_is_zero(pfid) && !lu_fid_eq(pfid, pfid2)) {
*type = LNIT_UNMATCHED_PAIRS;
rc = lfsck_namespace_repair_unmatched_pairs(env,
com, child, pfid2, cname);
/* It is the most common case that we find the
* name entry corresponding to the linkEA entry
* that matches the ".." name entry. */
- rc = linkea_data_new(&ldata_new, &info->lti_big_buf);
- if (rc != 0)
- RETURN(rc);
-
- rc = linkea_add_buf(&ldata_new, cname, pfid2);
+ rc = linkea_links_new(&ldata_new, &info->lti_big_buf,
+ cname, pfid2);
if (rc != 0)
RETURN(rc);
if (rc < 0)
RETURN(rc);
- linkea_del_buf(ldata, cname);
- linkea_count++;
+ lfsck_linkea_del_buf(ldata, cname);
linkea_first_entry(ldata);
/* There may be some invalid dangling name entries under
* other parent directories, remove all of them. */
while (ldata->ld_lee != NULL) {
- lfsck_namespace_unpack_linkea_entry(ldata,
- cname, &tfid, info->lti_key);
- if (!fid_is_sane(&tfid))
+ rc = lfsck_namespace_unpack_linkea_entry(ldata,
+ cname, &tfid, info->lti_key,
+ sizeof(info->lti_key));
+ if (rc != 0)
goto next;
parent = lfsck_object_find_bottom(env, lfsck,
dirent_count += rc;
next:
- linkea_del_buf(ldata, cname);
+ lfsck_linkea_del_buf(ldata, cname);
}
ns->ln_dirent_repaired += dirent_count;
RETURN(rc);
- }
+ } /* lu_fid_eq(&tfid, lfsck_dto2fid(child)) */
lfsck_ibits_unlock(lh, LCK_EX);
/* The name entry references another MDT-object that may be
if (rc > 0)
goto rebuild;
- linkea_del_buf(ldata, cname);
- }
+ lfsck_linkea_del_buf(ldata, cname);
+ } /* while (ldata->ld_lee != NULL) */
+
+ /* If there is still linkEA overflow, return. */
+ if (unlikely(ldata->ld_leh->leh_overflow_time))
+ RETURN(0);
linkea_first_entry(ldata);
if (ldata->ld_leh->leh_reccount == 1) {
rc = lfsck_namespace_dsd_single(env, com, child, pfid, ldata,
- lh, type, NULL);
-
- if (rc == 0 && fid_is_zero(pfid) && linkea_count > 0)
- rc = lfsck_namespace_rebuild_linkea(env, com, child,
- ldata);
+ lh, type, NULL, unknown);
RETURN(rc);
}
*
* If all the known name entries have been verified, then the object's hard
* link attribute should match the object's linkEA entries count unless the
- * object's has too much hard link to be recorded in the linkEA. Such cases
+ * object's has too many hard link to be recorded in the linkEA. Such cases
* should have been marked in the LFSCK trace file. Otherwise, trust the
* linkEA to update the object's nlink attribute.
*
struct dt_object *obj,
struct lu_attr *la)
{
- struct lfsck_thread_info *info = lfsck_env_info(env);
- struct lu_fid *tfid = &info->lti_fid3;
struct lfsck_namespace *ns = com->lc_file_ram;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct dt_device *dev = lfsck_obj2dev(obj);
struct linkea_data ldata = { NULL };
struct lustre_handle lh = { 0 };
__u32 old = la->la_nlink;
- int idx;
int rc = 0;
- __u8 flags;
ENTRY;
LASSERT(!dt_object_remote(obj));
if (ns->ln_flags & LF_INCOMPLETE)
GOTO(unlock, rc = 0);
- fid_cpu_to_be(tfid, cfid);
- idx = lfsck_sub_trace_file_fid2idx(cfid);
- rc = dt_lookup(env, com->lc_sub_trace_objs[idx].lsto_obj,
- (struct dt_rec *)&flags, (const struct dt_key *)tfid);
- if (rc != 0)
- GOTO(unlock, rc);
-
- if (flags & LNTF_SKIP_NLINK)
- GOTO(unlock, rc = 0);
-
rc = dt_attr_get(env, obj, la);
if (rc != 0)
GOTO(unlock, rc = (rc == -ENOENT ? 0 : rc));
- rc = lfsck_links_read2(env, obj, &ldata);
- if (rc != 0)
+ rc = lfsck_links_read2_with_rec(env, obj, &ldata);
+ if (rc)
GOTO(unlock, rc = (rc == -ENODATA ? 0 : rc));
- if (la->la_nlink == ldata.ld_leh->leh_reccount ||
- unlikely(la->la_nlink == 0))
+ /* XXX: Currently, we only update the nlink attribute if the known
+ * linkEA entries is larger than the nlink attribute. That is
+ * safe action. */
+ if (la->la_nlink >= ldata.ld_leh->leh_reccount ||
+ unlikely(la->la_nlink == 0 ||
+ ldata.ld_leh->leh_overflow_time))
GOTO(unlock, rc = 0);
la->la_nlink = ldata.ld_leh->leh_reccount;
}
GOTO(out, rc);
- }
+ } /* rc != 0 */
linkea_first_entry(&ldata);
/* This is the most common case: the object has unique linkEA entry. */
if (ldata.ld_leh->leh_reccount == 1) {
rc = lfsck_namespace_dsd_single(env, com, child, pfid, &ldata,
- &lh, &type, &retry);
+ &lh, &type, &retry, &unknown);
if (retry) {
LASSERT(!lustre_handle_is_used(&lh));
* but the LFSCK cannot aware that at that time, then it adds
* the bad linkEA entry for further processing. */
rc = lfsck_namespace_dsd_multiple(env, com, child, pfid, &ldata,
- &lh, &type, lpf);
+ &lh, &type, lpf, &unknown);
GOTO(out, rc);
return rc;
}
+#define lfsck_time_before(a, b) \
+ (typecheck(__u32, a) && \
+ typecheck(__u32, b) && \
+ ((int)(a) - (int)(b) < 0))
+
+static inline bool
+lfsck_namespace_linkea_stale_overflow(struct linkea_data *ldata,
+ struct lfsck_namespace *ns)
+{
+ /* Both the leh_overflow_time and ln_time_latest_reset are
+ * local time based, so need NOT to care about clock drift
+ * among the servers. */
+ return ldata->ld_leh->leh_overflow_time &&
+ lfsck_time_before(ldata->ld_leh->leh_overflow_time,
+ ns->ln_time_latest_reset);
+}
+
+/**
+ * Clear the object's linkEA overflow timestamp.
+ *
+ * If the MDT-object has too many hard links as to the linkEA cannot hold
+ * all of them, then overflow timestamp will be set in the linkEA header.
+ * If some hard links are removed after that, then it is possible to hold
+ * other missed linkEA entries. If the namespace LFSCK have added all the
+ * related linkEA entries, then it will remove the overflow timestamp.
+ *
+ * \param[in] env pointer to the thread context
+ * \param[in] com pointer to the lfsck component
+ * \param[in] ldata pointer to the linkEA data for the given @obj
+ * \param[in] obj pointer to the dt_object to be handled
+ *
+ * \retval positive number for repaired cases
+ * \retval 0 if nothing to be repaired
+ * \retval negative error number on failure
+ */
+static int lfsck_namespace_linkea_clear_overflow(const struct lu_env *env,
+ struct lfsck_component *com,
+ struct linkea_data *ldata,
+ struct dt_object *obj)
+{
+ struct lfsck_namespace *ns = com->lc_file_ram;
+ struct lfsck_instance *lfsck = com->lc_lfsck;
+ struct dt_device *dev = lfsck_obj2dev(obj);
+ struct thandle *th = NULL;
+ struct lustre_handle lh = { 0 };
+ struct lu_buf linkea_buf;
+ int rc = 0;
+ ENTRY;
+
+ LASSERT(!dt_object_remote(obj));
+
+ rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
+ MDS_INODELOCK_UPDATE, LCK_PW);
+ if (rc != 0)
+ GOTO(log, rc);
+
+ th = dt_trans_create(env, dev);
+ if (IS_ERR(th))
+ GOTO(log, rc = PTR_ERR(th));
+
+ rc = dt_declare_xattr_set(env, obj,
+ lfsck_buf_get_const(env, NULL, MAX_LINKEA_SIZE),
+ XATTR_NAME_LINK, 0, th);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ rc = dt_trans_start_local(env, dev, th);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ dt_write_lock(env, obj, 0);
+ rc = lfsck_links_read(env, obj, ldata);
+ if (rc != 0)
+ GOTO(unlock, rc);
+
+ if (unlikely(!lfsck_namespace_linkea_stale_overflow(ldata, ns)))
+ GOTO(unlock, rc = 0);
+
+ ldata->ld_leh->leh_overflow_time = 0;
+ if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+ GOTO(unlock, rc = 1);
+
+ /* If all known entries are in the linkEA, then the 'leh_reccount'
+ * should NOT be zero. */
+ LASSERT(ldata->ld_leh->leh_reccount > 0);
+
+ lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
+ ldata->ld_leh->leh_len);
+ rc = dt_xattr_set(env, obj, &linkea_buf, XATTR_NAME_LINK, 0, th);
+ if (unlikely(rc == -ENOSPC))
+ rc = 0;
+ else if (!rc)
+ rc = 1;
+
+ GOTO(unlock, rc);
+
+unlock:
+ dt_write_unlock(env, obj);
+
+stop:
+ dt_trans_stop(env, dev, th);
+
+log:
+ lfsck_ibits_unlock(&lh, LCK_PW);
+ CDEBUG(D_LFSCK, "%s: clear linkea overflow timestamp for the object "
+ DFID": rc = %d\n",
+ lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)), rc);
+
+ return rc;
+}
+
/**
* Double scan the MDT-object for namespace LFSCK.
*
rc = lfsck_links_read(env, child, &ldata);
dt_read_unlock(env, child);
+
+ if (rc == -EINVAL) {
+ struct lustre_handle lh = { 0 };
+
+ rc = lfsck_ibits_lock(env, com->lc_lfsck, child, &lh,
+ MDS_INODELOCK_UPDATE |
+ MDS_INODELOCK_XATTR, LCK_EX);
+ if (rc == 0) {
+ rc = lfsck_namespace_links_remove(env, com, child);
+ lfsck_ibits_unlock(&lh, LCK_EX);
+ }
+
+ GOTO(out, rc);
+ }
+
if (rc != 0)
GOTO(out, rc);
+ if (!(ns->ln_flags & LF_INCOMPLETE) &&
+ unlikely(lfsck_namespace_linkea_stale_overflow(&ldata, ns))) {
+ rc = lfsck_namespace_linkea_clear_overflow(env, com, &ldata,
+ child);
+ if (rc < 0)
+ GOTO(out, rc);
+
+ if (rc > 0)
+ ns->ln_linkea_overflow_cleared++;
+ }
+
linkea_first_entry(&ldata);
while (ldata.ld_lee != NULL) {
- lfsck_namespace_unpack_linkea_entry(&ldata, cname, pfid,
- info->lti_key);
+ rc = lfsck_namespace_unpack_linkea_entry(&ldata, cname, pfid,
+ info->lti_key,
+ sizeof(info->lti_key));
+ /* Invalid PFID in the linkEA entry. */
+ if (rc != 0) {
+ rc = lfsck_namespace_shrink_linkea(env, com, child,
+ &ldata, cname, pfid, true);
+ if (rc < 0)
+ GOTO(out, rc);
+
+ if (rc > 0)
+ repaired = true;
+
+ continue;
+ }
+
rc = lfsck_namespace_filter_linkea_entry(&ldata, cname, pfid,
false);
/* Found repeated linkEA entries */
/* fall through */
}
- /* Invalid PFID in the linkEA entry. */
- if (!fid_is_sane(pfid)) {
- rc = lfsck_namespace_shrink_linkea(env, com, child,
- &ldata, cname, pfid, true);
- if (rc < 0)
- GOTO(out, rc);
-
- if (rc > 0)
- repaired = true;
-
- continue;
- }
-
parent = lfsck_object_find_bottom(env, lfsck, pfid);
if (IS_ERR(parent))
GOTO(out, rc = PTR_ERR(parent));
repaired = true;
continue;
- }
+ } /* !dt_object_exists(parent) */
/* The linkEA entry with bad parent will be removed. */
if (unlikely(!dt_try_as_dir(env, parent))) {
continue;
}
+ /* The following handles -ENOENT case */
+
rc = dt_attr_get(env, child, la);
if (rc != 0)
GOTO(out, rc);
/* If there is no name entry in the parent dir and the object
- * link count is less than the linkea entries count, then the
+ * link count is fewer than the linkea entries count, then the
* linkea entry should be removed. */
if (ldata.ld_leh->leh_reccount > la->la_nlink) {
rc = lfsck_namespace_shrink_linkea_cond(env, com,
if (rc < 0 && rc != -ENODATA)
return rc;
- if (rc == 0) {
- LASSERT(ldata.ld_leh != NULL);
-
+ if (rc == 0 && ldata.ld_leh != NULL)
count = ldata.ld_leh->leh_reccount;
- }
if (count == 0) {
/* If the LFSCK is marked as LF_INCOMPLETE, then means some
* other MDT that references this object with another name,
* so we cannot know whether this linkEA is valid or not.
* So keep it there and maybe resolved when next LFSCK run. */
- if (!(ns->ln_flags & LF_INCOMPLETE)) {
+ if (!(ns->ln_flags & LF_INCOMPLETE) &&
+ (ldata.ld_leh == NULL ||
+ !ldata.ld_leh->leh_overflow_time)) {
/* If the child becomes orphan, then insert it into
* the global .lustre/lost+found/MDTxxxx directory. */
rc = lfsck_namespace_insert_orphan(env, com, child,
PFID(lfsck_dto2fid(child)),
la->la_nlink, count,
lfsck_object_type(child));
- } else {
+ } else if (la->la_nlink < count &&
+ likely(!ldata.ld_leh->leh_overflow_time)) {
rc = lfsck_namespace_repair_nlink(env, com,
child, la);
if (rc > 0) {
__u32 time_phase1,
__u32 time_phase2)
{
- seq_printf(m, "checked_phase1: "LPU64"\n"
- "checked_phase2: "LPU64"\n"
- "updated_phase1: "LPU64"\n"
- "updated_phase2: "LPU64"\n"
- "failed_phase1: "LPU64"\n"
- "failed_phase2: "LPU64"\n"
- "directories: "LPU64"\n"
- "dirent_repaired: "LPU64"\n"
- "linkea_repaired: "LPU64"\n"
- "nlinks_repaired: "LPU64"\n"
- "multiple_linked_checked: "LPU64"\n"
- "multiple_linked_repaired: "LPU64"\n"
- "unknown_inconsistency: "LPU64"\n"
- "unmatched_pairs_repaired: "LPU64"\n"
- "dangling_repaired: "LPU64"\n"
- "multiple_referenced_repaired: "LPU64"\n"
- "bad_file_type_repaired: "LPU64"\n"
- "lost_dirent_repaired: "LPU64"\n"
- "local_lost_found_scanned: "LPU64"\n"
- "local_lost_found_moved: "LPU64"\n"
- "local_lost_found_skipped: "LPU64"\n"
- "local_lost_found_failed: "LPU64"\n"
- "striped_dirs_scanned: "LPU64"\n"
- "striped_dirs_repaired: "LPU64"\n"
- "striped_dirs_failed: "LPU64"\n"
- "striped_dirs_disabled: "LPU64"\n"
- "striped_dirs_skipped: "LPU64"\n"
- "striped_shards_scanned: "LPU64"\n"
- "striped_shards_repaired: "LPU64"\n"
- "striped_shards_failed: "LPU64"\n"
- "striped_shards_skipped: "LPU64"\n"
- "name_hash_repaired: "LPU64"\n"
+ seq_printf(m, "checked_phase1: %llu\n"
+ "checked_phase2: %llu\n"
+ "updated_phase1: %llu\n"
+ "updated_phase2: %llu\n"
+ "failed_phase1: %llu\n"
+ "failed_phase2: %llu\n"
+ "directories: %llu\n"
+ "dirent_repaired: %llu\n"
+ "linkea_repaired: %llu\n"
+ "nlinks_repaired: %llu\n"
+ "multiple_linked_checked: %llu\n"
+ "multiple_linked_repaired: %llu\n"
+ "unknown_inconsistency: %llu\n"
+ "unmatched_pairs_repaired: %llu\n"
+ "dangling_repaired: %llu\n"
+ "multiple_referenced_repaired: %llu\n"
+ "bad_file_type_repaired: %llu\n"
+ "lost_dirent_repaired: %llu\n"
+ "local_lost_found_scanned: %llu\n"
+ "local_lost_found_moved: %llu\n"
+ "local_lost_found_skipped: %llu\n"
+ "local_lost_found_failed: %llu\n"
+ "striped_dirs_scanned: %llu\n"
+ "striped_dirs_repaired: %llu\n"
+ "striped_dirs_failed: %llu\n"
+ "striped_dirs_disabled: %llu\n"
+ "striped_dirs_skipped: %llu\n"
+ "striped_shards_scanned: %llu\n"
+ "striped_shards_repaired: %llu\n"
+ "striped_shards_failed: %llu\n"
+ "striped_shards_skipped: %llu\n"
+ "name_hash_repaired: %llu\n"
+ "linkea_overflow_cleared: %llu\n"
"success_count: %u\n"
"run_time_phase1: %u seconds\n"
"run_time_phase2: %u seconds\n",
ns->ln_striped_shards_failed,
ns->ln_striped_shards_skipped,
ns->ln_name_hash_repaired,
+ ns->ln_linkea_overflow_cleared,
ns->ln_success_count,
time_phase1,
time_phase2);
struct lfsck_namespace *ns = com->lc_file_ram;
struct lfsck_assistant_data *lad = com->lc_data;
struct dt_object *root;
- struct dt_object *dto;
int rc;
ENTRY;
}
ns->ln_magic = LFSCK_NAMESPACE_MAGIC;
ns->ln_status = LS_INIT;
+ ns->ln_time_latest_reset = cfs_time_current_sec();
- lfsck_object_put(env, com->lc_obj);
- com->lc_obj = NULL;
- dto = lfsck_namespace_load_one_trace_file(env, com, root,
- LFSCK_NAMESPACE, true);
- if (IS_ERR(dto))
- GOTO(out, rc = PTR_ERR(dto));
+ rc = lfsck_load_one_trace_file(env, com, root, &com->lc_obj,
+ &dt_lfsck_namespace_features,
+ LFSCK_NAMESPACE, true);
+ if (rc)
+ GOTO(out, rc);
- com->lc_obj = dto;
- rc = lfsck_namespace_load_sub_trace_files(env, com, true);
+ rc = lfsck_load_sub_trace_files(env, com, &dt_lfsck_namespace_features,
+ LFSCK_NAMESPACE, true);
if (rc != 0)
GOTO(out, rc);
up_write(&com->lc_sem);
log:
- CDEBUG(D_LFSCK, "%s: namespace LFSCK checkpoint at the pos ["LPU64
- ", "DFID", "LPX64"], status = %d: rc = %d\n",
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK checkpoint at the pos [%llu"
+ ", "DFID", %#llx], status = %d: rc = %d\n",
lfsck_lfsck2name(lfsck), lfsck->li_pos_current.lp_oit_cookie,
PFID(&lfsck->li_pos_current.lp_dir_parent),
lfsck->li_pos_current.lp_dir_cookie, ns->ln_status, rc);
rc = lfsck_start_assistant(env, com, lsp);
- CDEBUG(D_LFSCK, "%s: namespace LFSCK prep done, start pos ["LPU64", "
- DFID", "LPX64"]: rc = %d\n",
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK prep done, start pos [%llu, "
+ DFID", %#llx]: rc = %d\n",
lfsck_lfsck2name(lfsck), pos->lp_oit_cookie,
PFID(&pos->lp_dir_parent), pos->lp_dir_cookie, rc);
GOTO(out, rc = (rc == -ENOENT ? 0 : rc));
}
- if (rc == -ENODATA) {
+ if (rc == -ENODATA || unlikely(!ldata.ld_leh->leh_reccount)) {
rc = lfsck_namespace_check_for_double_scan(env, com, obj);
GOTO(out, rc);
do_div(speed, rtime);
lfsck_namespace_dump_statistics(m, ns, checked, 0, rtime, 0);
- seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
+ seq_printf(m, "average_speed_phase1: %llu items/sec\n"
"average_speed_phase2: N/A\n"
- "average_speed_total: "LPU64" items/sec\n"
- "real_time_speed_phase1: "LPU64" items/sec\n"
+ "average_speed_total: %llu items/sec\n"
+ "real_time_speed_phase1: %llu items/sec\n"
"real_time_speed_phase2: N/A\n",
speed,
speed,
lfsck_namespace_dump_statistics(m, ns, ns->ln_items_checked,
checked,
ns->ln_run_time_phase1, rtime);
- seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
- "average_speed_phase2: "LPU64" objs/sec\n"
- "average_speed_total: "LPU64" items/sec\n"
+ seq_printf(m, "average_speed_phase1: %llu items/sec\n"
+ "average_speed_phase2: %llu objs/sec\n"
+ "average_speed_total: %llu items/sec\n"
"real_time_speed_phase1: N/A\n"
- "real_time_speed_phase2: "LPU64" objs/sec\n"
+ "real_time_speed_phase2: %llu objs/sec\n"
"current_position: "DFID"\n",
speed1,
speed2,
ns->ln_objs_checked_phase2,
ns->ln_run_time_phase1,
ns->ln_run_time_phase2);
- seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
- "average_speed_phase2: "LPU64" objs/sec\n"
- "average_speed_total: "LPU64" items/sec\n"
+ seq_printf(m, "average_speed_phase1: %llu items/sec\n"
+ "average_speed_phase2: %llu objs/sec\n"
+ "average_speed_total: %llu items/sec\n"
"real_time_speed_phase1: N/A\n"
"real_time_speed_phase2: N/A\n"
"current_position: N/A\n",
ENTRY;
switch (lr->lr_event) {
- case LE_SKIP_NLINK_DECLARE: {
- struct dt_object *obj;
- struct lu_fid *key = &lfsck_env_info(env)->lti_fid3;
- int idx;
- __u8 flags = 0;
-
- LASSERT(th != NULL);
-
- idx = lfsck_sub_trace_file_fid2idx(&lr->lr_fid);
- obj = com->lc_sub_trace_objs[idx].lsto_obj;
- fid_cpu_to_be(key, &lr->lr_fid);
- mutex_lock(&com->lc_sub_trace_objs[idx].lsto_mutex);
- rc = dt_declare_delete(env, obj,
- (const struct dt_key *)key, th);
- if (rc == 0)
- rc = dt_declare_insert(env, obj,
- (const struct dt_rec *)&flags,
- (const struct dt_key *)key, th);
- mutex_unlock(&com->lc_sub_trace_objs[idx].lsto_mutex);
-
- RETURN(rc);
- }
- case LE_SKIP_NLINK: {
- struct dt_object *obj;
- struct lu_fid *key = &lfsck_env_info(env)->lti_fid3;
- int idx;
- __u8 flags = 0;
- bool exist = false;
- ENTRY;
-
- LASSERT(th != NULL);
-
- idx = lfsck_sub_trace_file_fid2idx(&lr->lr_fid);
- obj = com->lc_sub_trace_objs[idx].lsto_obj;
- fid_cpu_to_be(key, &lr->lr_fid);
- mutex_lock(&com->lc_sub_trace_objs[idx].lsto_mutex);
- rc = dt_lookup(env, obj, (struct dt_rec *)&flags,
- (const struct dt_key *)key);
- if (rc == 0) {
- if (flags & LNTF_SKIP_NLINK) {
- mutex_unlock(
- &com->lc_sub_trace_objs[idx].lsto_mutex);
-
- RETURN(0);
- }
-
- exist = true;
- } else if (rc != -ENOENT) {
- GOTO(log, rc);
- }
-
- flags |= LNTF_SKIP_NLINK;
- if (exist) {
- rc = dt_delete(env, obj, (const struct dt_key *)key,
- th);
- if (rc != 0)
- GOTO(log, rc);
- }
-
- rc = dt_insert(env, obj, (const struct dt_rec *)&flags,
- (const struct dt_key *)key, th, 1);
-
- GOTO(log, rc);
-
-log:
- mutex_unlock(&com->lc_sub_trace_objs[idx].lsto_mutex);
- CDEBUG(D_LFSCK, "%s: RPC service thread mark the "DFID
- " to be skipped for namespace double scan: rc = %d\n",
- lfsck_lfsck2name(com->lc_lfsck), PFID(&lr->lr_fid), rc);
-
- if (rc != 0)
- /* If we cannot record this object in the LFSCK tracing,
- * we have to mark the LFSC as LF_INCOMPLETE, then the
- * LFSCK will skip nlink attribute verification for
- * all objects. */
- ns->ln_flags |= LF_INCOMPLETE;
-
- return 0;
- }
case LE_SET_LMV_MASTER: {
struct dt_object *obj;
if (IS_ERR(child))
GOTO(log, rc = PTR_ERR(child));
- rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
- if (rc != 0)
- GOTO(log, rc);
-
- rc = linkea_add_buf(&ldata, cname, pfid);
+ rc = linkea_links_new(&ldata, &info->lti_linkea_buf2,
+ cname, pfid);
if (rc != 0)
GOTO(log, rc);
goto again;
}
+ LASSERT(handle != NULL);
+
if (dir == NULL) {
dir = lfsck_assistant_object_load(env, lfsck, lso);
if (IS_ERR(dir)) {
LASSERT(newdata);
rc = dt_xattr_del(env, obj, XATTR_NAME_LINK, handle);
- if (rc != 0)
+ if (rc != 0 && rc != -ENOENT && rc != -ENODATA)
GOTO(stop, rc);
}
}
rc = linkea_add_buf(&ldata, cname, pfid);
- if (rc != 0)
- GOTO(stop, rc);
-
- rc = lfsck_links_write(env, obj, &ldata, handle);
- if (unlikely(rc == -ENOSPC) &&
- S_ISREG(lfsck_object_type(obj)) && !dt_object_remote(obj)) {
- if (handle != NULL) {
- LASSERT(dt_write_locked(env, obj));
-
- dt_write_unlock(env, obj);
- dtlocked = false;
-
- dt_trans_stop(env, dev, handle);
- handle = NULL;
-
- lfsck_ibits_unlock(&lh, LCK_EX);
- }
-
- rc = lfsck_namespace_trace_update(env, com,
- &lnr->lnr_fid, LNTF_SKIP_NLINK, true);
- if (rc != 0)
- /* If we cannot record this object in the
- * LFSCK tracing, we have to mark the LFSCK
- * as LF_INCOMPLETE, then the LFSCK will
- * skip nlink attribute verification for
- * all objects. */
- ns->ln_flags |= LF_INCOMPLETE;
-
- GOTO(out, rc = 0);
- }
-
+ if (rc == 0)
+ rc = lfsck_links_write(env, obj, &ldata, handle);
if (rc != 0)
GOTO(stop, rc);
break;
}
- if (count == 1 && S_ISREG(lfsck_object_type(obj)))
+ if (obj != NULL && count == 1 &&
+ S_ISREG(lfsck_object_type(obj)))
dt_attr_get(env, obj, la);
}
if (!(bk->lb_param & LPF_FAILOUT))
rc = 0;
} else {
- if (log)
- CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
- "repaired the entry: "DFID", parent "DFID
- ", name %.*s\n", lfsck_lfsck2name(lfsck),
- PFID(&lnr->lnr_fid), PFID(pfid),
- lnr->lnr_namelen, lnr->lnr_name);
-
if (repaired) {
ns->ln_items_repaired++;
+ if (log)
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
+ "repaired the entry: "DFID", parent "DFID
+ ", name %.*s, type %d\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(&lnr->lnr_fid), PFID(pfid),
+ lnr->lnr_namelen, lnr->lnr_name, type);
switch (type) {
case LNIT_DANGLING:
ns->ln_name_hash_repaired++;
/* Not count repeatedly. */
- if (!repaired)
+ if (!repaired) {
ns->ln_items_repaired++;
+ if (log)
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK "
+ "assistant repaired the entry: "
+ DFID", parent "DFID
+ ", name %.*s\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(&lnr->lnr_fid), PFID(pfid),
+ lnr->lnr_namelen, lnr->lnr_name);
+ }
if (bk->lb_param & LPF_DRYRUN &&
lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
down_write(&com->lc_sem);
com->lc_new_checked++;
com->lc_new_scanned++;
- if (rc >= 0 && fid_is_sane(&fid))
+ if (rc >= 0)
ns->ln_fid_latest_scanned_phase2 = fid;
+
if (rc > 0)
ns->ln_objs_repaired_phase2++;
else if (rc < 0)
ns->ln_time_last_checkpoint = cfs_time_current_sec();
ns->ln_objs_checked_phase2 += com->lc_new_checked;
com->lc_new_checked = 0;
- rc = lfsck_namespace_store(env, com);
+ lfsck_namespace_store(env, com);
up_write(&com->lc_sem);
- if (rc != 0)
- GOTO(put, rc);
com->lc_time_last_checkpoint = cfs_time_current();
com->lc_time_next_checkpoint =
struct lfsck_assistant_data *lad = com->lc_data;
struct lfsck_namespace_req *lnr;
+ if (((struct lfsck_namespace *)(com->lc_file_ram))->ln_status !=
+ LS_SCANNING_PHASE1)
+ return;
+
if (list_empty(&lad->lad_req_list))
return;
LASSERT(S_ISDIR(lfsck_object_type(obj)));
- rc = lfsck_links_read(env, obj, &ldata);
+ rc = lfsck_links_read_with_rec(env, obj, &ldata);
if (rc == -ENODATA) {
dirty = true;
} else if (rc == 0) {
if (!dirty)
RETURN(rc);
- rc = linkea_data_new(&ldata, &lfsck_env_info(env)->lti_linkea_buf);
- if (rc != 0)
- RETURN(rc);
-
- rc = linkea_add_buf(&ldata, cname, pfid);
+ rc = linkea_links_new(&ldata, &lfsck_env_info(env)->lti_linkea_buf,
+ cname, pfid);
if (rc != 0)
RETURN(rc);
struct linkea_data ldata = { NULL };
int rc;
- rc = lfsck_links_read(env, obj, &ldata);
- if (rc != 0)
+ rc = lfsck_links_read_with_rec(env, obj, &ldata);
+ if (rc)
return rc;
linkea_first_entry(&ldata);
- if (ldata.ld_lee == NULL)
- return -ENODATA;
-
linkea_entry_unpack(ldata.ld_lee, &ldata.ld_reclen, cname, pfid);
/* To guarantee the 'name' is terminated with '0'. */
memcpy(name, cname->ln_name, cname->ln_namelen);
obj = local_index_find_or_create(env, lfsck->li_los, root,
LFSCK_NAMESPACE,
S_IFREG | S_IRUGO | S_IWUSR,
- &dt_lfsck_features);
+ &dt_lfsck_namespace_features);
if (IS_ERR(obj))
GOTO(out, rc = PTR_ERR(obj));
else if (rc < 0)
rc = lfsck_namespace_reset(env, com, true);
else
- rc = lfsck_namespace_load_sub_trace_files(env, com, false);
+ rc = lfsck_load_sub_trace_files(env, com,
+ &dt_lfsck_namespace_features, LFSCK_NAMESPACE, false);
if (rc != 0)
GOTO(out, rc);