LU-3039 lfsck: misc patch for LFSCK 1.5 debts (1)

[fs/lustre-release.git] / lustre / mdd / mdd_lfsck.c

diff --git a/lustre/mdd/mdd_lfsck.c b/lustre/mdd/mdd_lfsck.c
index f012418..dd8979e 100644 (file)
--- a/lustre/mdd/mdd_lfsck.c
+++ b/lustre/mdd/mdd_lfsck.c
@@ -261,13 +261,12 @@ static void mdd_lfsck_pos_fill(const struct lu_env *env, struct md_lfsck *lfsck,
 
                LASSERT(pos->lp_dir_cookie != MDS_DIR_DUMMY_START);
 
-               if (pos->lp_dir_cookie == MDS_DIR_END_OFF)
-                       LASSERT(dir_processed);
-
-               /* For the dir which just to be processed,
-                * lp_dir_cookie will become MDS_DIR_DUMMY_START,
-                * which can be correctly handled by mdd_lfsck_prep. */
-               if (!dir_processed)
+               if (pos->lp_dir_cookie >= MDS_DIR_END_OFF)
+                       pos->lp_dir_cookie = MDS_DIR_END_OFF;
+               else if (!dir_processed)
+                       /* For the dir which just to be processed,
+                        * lp_dir_cookie will become MDS_DIR_DUMMY_START,
+                        * which can be correctly handled by mdd_lfsck_prep. */
                        pos->lp_dir_cookie--;
        } else {
                fid_zero(&pos->lp_dir_parent);