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-5560 llite: basic support of SELinux in CLIO
[fs/lustre-release.git]
/
lustre
/
lfsck
/
lfsck_lib.c
diff --git
a/lustre/lfsck/lfsck_lib.c
b/lustre/lfsck/lfsck_lib.c
index
3905d85
..
178aa3a
100644
(file)
--- a/
lustre/lfsck/lfsck_lib.c
+++ b/
lustre/lfsck/lfsck_lib.c
@@
-149,7
+149,7
@@
static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds)
}
cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
}
cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
- ltd =
LTD_TGT
(ltds, idx);
+ ltd =
lfsck_ltd2tgt
(ltds, idx);
if (likely(ltd != NULL)) {
LASSERT(list_empty(<d->ltd_layout_list));
LASSERT(list_empty(<d->ltd_layout_phase_list));
if (likely(ltd != NULL)) {
LASSERT(list_empty(<d->ltd_layout_list));
LASSERT(list_empty(<d->ltd_layout_phase_list));
@@
-158,7
+158,7
@@
static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds)
ltds->ltd_tgtnr--;
cfs_bitmap_clear(ltds->ltd_tgts_bitmap, idx);
ltds->ltd_tgtnr--;
cfs_bitmap_clear(ltds->ltd_tgts_bitmap, idx);
-
LTD_TGT(ltds, idx) = NULL
;
+
lfsck_assign_tgt(ltds, NULL, idx)
;
lfsck_tgt_put(ltd);
}
}
lfsck_tgt_put(ltd);
}
}
@@
-230,7
+230,7
@@
static int __lfsck_add_target(const struct lu_env *env,
GOTO(unlock, rc = -ENOMEM);
}
GOTO(unlock, rc = -ENOMEM);
}
-
LTD_TGT(ltds, index) = ltd
;
+
lfsck_assign_tgt(ltds, ltd, index)
;
cfs_bitmap_set(ltds->ltd_tgts_bitmap, index);
ltds->ltd_tgtnr++;
cfs_bitmap_set(ltds->ltd_tgts_bitmap, index);
ltds->ltd_tgtnr++;
@@
-2400,6
+2400,7
@@
int lfsck_start_assistant(const struct lu_env *env, struct lfsck_component *com,
lad->lad_to_double_scan = 0;
lad->lad_in_double_scan = 0;
lad->lad_exit = 0;
lad->lad_to_double_scan = 0;
lad->lad_in_double_scan = 0;
lad->lad_exit = 0;
+ lad->lad_advance_lock = false;
thread_set_flags(athread, 0);
lta = lfsck_thread_args_init(lfsck, com, lsp);
thread_set_flags(athread, 0);
lta = lfsck_thread_args_init(lfsck, com, lsp);
@@
-3511,7
+3512,7
@@
void lfsck_del_target(const struct lu_env *env, struct dt_device *key,
if (unlikely(index >= ltds->ltd_tgts_bitmap->size))
goto unlock;
if (unlikely(index >= ltds->ltd_tgts_bitmap->size))
goto unlock;
- ltd =
LTD_TGT
(ltds, index);
+ ltd =
lfsck_ltd2tgt
(ltds, index);
if (unlikely(ltd == NULL))
goto unlock;
if (unlikely(ltd == NULL))
goto unlock;
@@
-3519,7
+3520,7
@@
void lfsck_del_target(const struct lu_env *env, struct dt_device *key,
ltds->ltd_tgtnr--;
cfs_bitmap_clear(ltds->ltd_tgts_bitmap, index);
ltds->ltd_tgtnr--;
cfs_bitmap_clear(ltds->ltd_tgts_bitmap, index);
-
LTD_TGT(ltds, index) = NULL
;
+
lfsck_assign_tgt(ltds, NULL, index)
;
unlock:
if (ltd == NULL) {
unlock:
if (ltd == NULL) {