Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3336 lfsck: namespace visible lost+found directory
[fs/lustre-release.git]
/
lustre
/
lfsck
/
lfsck_engine.c
diff --git
a/lustre/lfsck/lfsck_engine.c
b/lustre/lfsck/lfsck_engine.c
index
8daeb1b
..
e31faf3
100644
(file)
--- a/
lustre/lfsck/lfsck_engine.c
+++ b/
lustre/lfsck/lfsck_engine.c
@@
-306,6
+306,12
@@
static int lfsck_master_oit_engine(const struct lu_env *env,
ostid_to_fid(fid, oi, idx);
update_lma = true;
}
ostid_to_fid(fid, oi, idx);
update_lma = true;
}
+ } else if (!fid_is_norm(fid) && !fid_is_igif(fid) &&
+ !fid_is_last_id(fid) && !fid_is_root(fid) &&
+ !fid_seq_is_dot(fid_seq(fid))) {
+ /* If the FID/object is only used locally and invisible
+ * to external nodes, then LFSCK will not handle it. */
+ goto checkpoint;
}
target = lfsck_object_find(env, lfsck, fid);
}
target = lfsck_object_find(env, lfsck, fid);
@@
-368,6
+374,7
@@
int lfsck_master_engine(void *args)
struct dt_object *oit_obj = lfsck->li_obj_oit;
const struct dt_it_ops *oit_iops = &oit_obj->do_index_ops->dio_it;
struct dt_it *oit_di;
struct dt_object *oit_obj = lfsck->li_obj_oit;
const struct dt_it_ops *oit_iops = &oit_obj->do_index_ops->dio_it;
struct dt_it *oit_di;
+ struct l_wait_info lwi = { 0 };
int rc;
ENTRY;
int rc;
ENTRY;
@@
-383,7
+390,7
@@
int lfsck_master_engine(void *args)
spin_lock(&lfsck->li_lock);
lfsck->li_di_oit = oit_di;
spin_unlock(&lfsck->li_lock);
spin_lock(&lfsck->li_lock);
lfsck->li_di_oit = oit_di;
spin_unlock(&lfsck->li_lock);
- rc = lfsck_prep(env, lfsck);
+ rc = lfsck_prep(env, lfsck
, lta->lta_lsp
);
if (rc != 0)
GOTO(fini_oit, rc);
if (rc != 0)
GOTO(fini_oit, rc);
@@
-400,6
+407,13
@@
int lfsck_master_engine(void *args)
spin_unlock(&lfsck->li_lock);
wake_up_all(&thread->t_ctl_waitq);
spin_unlock(&lfsck->li_lock);
wake_up_all(&thread->t_ctl_waitq);
+ l_wait_event(thread->t_ctl_waitq,
+ lfsck->li_start_unplug ||
+ !thread_is_running(thread),
+ &lwi);
+ if (!thread_is_running(thread))
+ GOTO(fini_oit, rc = 0);
+
if (!cfs_list_empty(&lfsck->li_list_scan) ||
cfs_list_empty(&lfsck->li_list_double_scan))
rc = lfsck_master_oit_engine(env, lfsck);
if (!cfs_list_empty(&lfsck->li_list_scan) ||
cfs_list_empty(&lfsck->li_list_double_scan))
rc = lfsck_master_oit_engine(env, lfsck);