- remove double check for MA_LOV

- remove orphans tests from ALWAYS_EXCEPT in replay-single.sh

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
index ec3e57a..dbd3c16 100644 (file)
--- a/lustre/mdd/mdd_lov.c
+++ b/lustre/mdd/mdd_lov.c
@@ -533,7 +533,9 @@ int mdd_unlink_log(const struct lu_context *ctxt, struct mdd_device *mdd,
 {
         struct obd_device *obd = mdd2obd_dev(mdd);
 
-        if ((ma->ma_cookie_size > 0) && ma->ma_valid&MA_LOV && 
+        LASSERT(ma->ma_valid & MA_LOV);
+
+        if ((ma->ma_cookie_size > 0) &&
             (mds_log_op_unlink(obd, ma->ma_lmm, ma->ma_lmm_size,
                               ma->ma_cookie, ma->ma_cookie_size) > 0)) {
                 ma->ma_valid |= MA_COOKIE;

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 99cd994..ad328c5 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -18,7 +18,7 @@ init_test_env $@
 ALWAYS_EXCEPT="0b  39   $REPLAY_SINGLE_EXCEPT"
 
 # failed in our b_new_cmd due to orphan handling.
-ALWAYS_EXCEPT=" 20b 25 30 31 $ALWAYS_EXCEPT"
+#ALWAYS_EXCEPT=" 20b 25 30 31 $ALWAYS_EXCEPT"
 
 # failed in our b_new_cmd due to MGS
 ALWAYS_EXCEPT=" 52 $ALWAYS_EXCEPT"