small fixes

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 97b802f..67aaa5b 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -939,7 +939,8 @@ static int mdt_reint_internal(struct mdt_thread_info *info,
                 struct mdt_client_data *mcd;
 
                 mcd = req->rq_export->exp_mdt_data.med_mcd;
-                if (mcd->mcd_last_xid == req->rq_xid) {
+                if (mcd->mcd_last_xid == req->rq_xid ||
+                    mcd->mcd_last_close_xid == req->rq_xid) {
                         mdt_reconstruct(info, lhc);
                         RETURN(lustre_msg_get_status(req->rq_repmsg));
                 }

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 4ae343f..1fa7628 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -714,10 +714,12 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc)
                         LASSERT(lhc != NULL);
                         
                         if (lustre_handle_is_used(&lhc->mlh_lh)) {
+                                struct ldlm_lock *lock;
+                                
                                 LASSERT(lustre_msg_get_flags(req->rq_reqmsg) &
                                         MSG_RESENT);
                                 
-                                struct ldlm_lock *lock = ldlm_handle2lock(&lhc->mlh_lh);
+                                lock = ldlm_handle2lock(&lhc->mlh_lh);
                                 if (!lock) {
                                         CERROR("Invalid lock handle "LPX64"\n",
                                                lhc->mlh_lh.cookie);