X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_bookmark.c;h=0aa94fa0102b2ead6057c040ce76d84dbca68824;hb=930d88e71d16c81a70f0e3c0b55e9c0c45344118;hp=f3bdee7c0cf7a8daa6371f2a0b8327a02aaf4e99;hpb=4c47e9caceed1cd7dfd3839a759b5574c1e86614;p=fs%2Flustre-release.git

diff --git a/lustre/lfsck/lfsck_bookmark.c b/lustre/lfsck/lfsck_bookmark.c
index f3bdee7..0aa94fa0 100644
--- a/lustre/lfsck/lfsck_bookmark.c
+++ b/lustre/lfsck/lfsck_bookmark.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_bookmark.c
@@ -33,7 +33,6 @@
 #include <lu_object.h>
 #include <dt_object.h>
 #include <lustre_fid.h>
-#include <lustre/lustre_user.h>
 
 #include "lfsck_internal.h"
 
@@ -263,9 +262,19 @@ int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
 			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) &&
@@ -277,7 +286,7 @@ int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
 
 		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) &&
@@ -289,7 +298,7 @@ int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
 
 		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) &&
@@ -301,39 +310,29 @@ int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
 
 		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;