Branch HEAD

[fs/lustre-release.git] / lustre / mdt / mdt_reint.c

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 676df34..8a0a9f0 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -353,16 +353,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                                         info->mti_epoch->handle.cookie);
                         GOTO(out_put, rc = -ESTALE);
                 }
-                if (mfd->mfd_mode != FMODE_SOM) {
-                        CWARN("mfd_mode %d not right should be in replay\n", 
-                               mfd->mfd_mode);
-                        LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & 
-                                MSG_REPLAY);
-                        LASSERT(mfd->mfd_mode == FMODE_EPOCH);
-                        mfd->mfd_mode = FMODE_SOM;
-                }
-                
-                LASSERT(ma->ma_attr.la_valid & LA_SIZE);
+                LASSERT(mfd->mfd_mode == FMODE_SOM);
                 LASSERT(!(info->mti_epoch->flags & MF_EPOCH_CLOSE));
 
                 class_handle_unhash(&mfd->mfd_handle);
@@ -408,7 +399,7 @@ static int mdt_reint_create(struct mdt_thread_info *info,
         int rc;
         ENTRY;
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE))
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE))
                 GOTO(out, rc = err_serious(-ESTALE));
 
         if (info->mti_dlm_req)
@@ -462,7 +453,7 @@ static int mdt_reint_unlink(struct mdt_thread_info *info,
         if (info->mti_dlm_req)
                 ldlm_request_cancel(req, info->mti_dlm_req, 0);
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK))
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK))
                 GOTO(out, rc = err_serious(-ENOENT));
 
         /* step 1: lock the parent */
@@ -562,7 +553,7 @@ static int mdt_reint_link(struct mdt_thread_info *info,
         DEBUG_REQ(D_INODE, req, "link "DFID" to "DFID"/%s",
                   PFID(rr->rr_fid1), PFID(rr->rr_fid2), rr->rr_name);
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK))
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK))
                 GOTO(out, rc = err_serious(-ENOENT));
 
         if (info->mti_dlm_req)