* GPL HEADER END
*/
/*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
*/
/*
* lustre/lfsck/lfsck_bookmark.c
#include <lu_object.h>
#include <dt_object.h>
#include <lustre_fid.h>
-#include <lustre/lustre_user.h>
#include "lfsck_internal.h"
dirty = true;
}
+ if ((bk->lb_param & LPF_OST_ORPHAN) &&
+ !(start->ls_flags & LPF_OST_ORPHAN)) {
+ bk->lb_param &= ~LPF_OST_ORPHAN;
+ dirty = true;
+ } else if (!(bk->lb_param & LPF_OST_ORPHAN) &&
+ (start->ls_flags & LPF_OST_ORPHAN)) {
+ bk->lb_param |= LPF_OST_ORPHAN;
+ dirty = true;
+ }
+
if ((start->ls_valid & LSV_CREATE_OSTOBJ) || reset) {
if ((bk->lb_param & LPF_CREATE_OSTOBJ) &&
- !(start->ls_valid & LSV_CREATE_OSTOBJ)) {
+ !(start->ls_flags & LPF_CREATE_OSTOBJ)) {
bk->lb_param &= ~LPF_CREATE_OSTOBJ;
dirty = true;
} else if (!(bk->lb_param & LPF_CREATE_OSTOBJ) &&
if ((start->ls_valid & LSV_CREATE_MDTOBJ) || reset) {
if ((bk->lb_param & LPF_CREATE_MDTOBJ) &&
- !(start->ls_valid & LSV_CREATE_MDTOBJ)) {
+ !(start->ls_flags & LPF_CREATE_MDTOBJ)) {
bk->lb_param &= ~LPF_CREATE_MDTOBJ;
dirty = true;
} else if (!(bk->lb_param & LPF_CREATE_MDTOBJ) &&
if ((start->ls_valid & LSV_DELAY_CREATE_OSTOBJ) || reset) {
if ((bk->lb_param & LPF_DELAY_CREATE_OSTOBJ) &&
- !(start->ls_valid & LSV_DELAY_CREATE_OSTOBJ)) {
+ !(start->ls_flags & LPF_DELAY_CREATE_OSTOBJ)) {
bk->lb_param &= ~LPF_DELAY_CREATE_OSTOBJ;
dirty = true;
} else if (!(bk->lb_param & LPF_DELAY_CREATE_OSTOBJ) &&
if ((start->ls_valid & LSV_ERROR_HANDLE) || reset) {
if ((bk->lb_param & LPF_FAILOUT) &&
- !(start->ls_valid & LSV_ERROR_HANDLE)) {
+ !(start->ls_flags & LPF_FAILOUT)) {
bk->lb_param &= ~LPF_FAILOUT;
dirty = true;
- } else if (!(start->ls_flags & LPF_FAILOUT) &&
- (bk->lb_param & LPF_FAILOUT)) {
- bk->lb_param &= ~LPF_FAILOUT;
+ } else if (!(bk->lb_param & LPF_FAILOUT) &&
+ (start->ls_flags & LPF_FAILOUT)) {
+ bk->lb_param |= LPF_FAILOUT;
dirty = true;
}
}
if ((start->ls_valid & LSV_DRYRUN) || reset) {
if ((bk->lb_param & LPF_DRYRUN) &&
- !(start->ls_valid & LSV_DRYRUN)) {
- bk->lb_param &= ~LPF_DRYRUN;
- dirty = true;
- } else if (!(start->ls_flags & LPF_DRYRUN) &&
- (bk->lb_param & LPF_DRYRUN)) {
+ !(start->ls_flags & LPF_DRYRUN)) {
bk->lb_param &= ~LPF_DRYRUN;
lfsck->li_drop_dryrun = 1;
dirty = true;
+ } else if (!(bk->lb_param & LPF_DRYRUN) &&
+ (start->ls_flags & LPF_DRYRUN)) {
+ bk->lb_param |= LPF_DRYRUN;
+ dirty = true;
}
}
- if ((bk->lb_param & LPF_OST_ORPHAN) &&
- !(start->ls_flags & LPF_OST_ORPHAN)) {
- bk->lb_param &= ~LPF_OST_ORPHAN;
- dirty = true;
- } else if (!(bk->lb_param & LPF_OST_ORPHAN) &&
- (start->ls_flags & LPF_OST_ORPHAN)) {
- bk->lb_param |= LPF_OST_ORPHAN;
- dirty = true;
- }
-
if (start->ls_valid & LSV_SPEED_LIMIT) {
if (__lfsck_set_speed(lfsck, start->ls_speed_limit))
dirty = true;
}
if (start->ls_valid & LSV_ASYNC_WINDOWS) {
- if (start->ls_async_windows < 1 ||
- start->ls_async_windows > LFSCK_ASYNC_WIN_MAX)
+ if (start->ls_async_windows < 1)
return -EINVAL;
if (bk->lb_async_windows != start->ls_async_windows) {