land 1.0.1 fixes on main development branch (head)

[fs/lustre-release.git] / lustre / mds / handler.c

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 67b3eb2..e6cb437 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -1015,7 +1015,7 @@ void mds_steal_ack_locks(struct obd_export *exp,
                sizeof req->rq_ack_locks);
         spin_lock_irqsave (&req->rq_lock, flags);
         oldrep->rq_resent = 1;
-        wake_up(&oldrep->rq_wait_for_rep);
+        wake_up(&oldrep->rq_reply_waitq);
         spin_unlock_irqrestore (&req->rq_lock, flags);
         DEBUG_REQ(D_HA, oldrep, "stole locks from");
         DEBUG_REQ(D_HA, req, "stole locks for");
@@ -1031,8 +1031,6 @@ int mds_handle(struct ptlrpc_request *req)
 
         OBD_FAIL_RETURN(OBD_FAIL_MDS_ALL_REQUEST_NET | OBD_FAIL_ONCE, 0);
 
-        LASSERT(!strcmp(req->rq_obd->obd_type->typ_name, LUSTRE_MDT_NAME));
-
         LASSERT(current->journal_info == NULL);
         /* XXX identical to OST */
         if (req->rq_reqmsg->opc != MDS_CONNECT) {