- Update ChangeLog

- only send cancels to the LDLM portal, since Peter pointed out that my last
  "fix" didn't really fix anything

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d505686..6ea122c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,3 +1,8 @@
+TBA
+       * version v0_5_16
+       * bug fixes:
+         - limit Lustre IOVs to PTL_MD_MAX_IOV (611336)
+
 2002-10-23  Phil Schwan  <phil@clusterfs.com>
        * version v0_5_15
        * bug fixes:

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index b56b4cb..27cb758 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -502,21 +502,7 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 rc = ldlm_handle_cp_callback(req);
                 RETURN(rc);
 
-        /* XXX FIXME move these three back to mds/handler.c, bug 625069 */
-        case LDLM_ENQUEUE:
-                CDEBUG(D_INODE, "enqueue\n");
-                OBD_FAIL_RETURN(OBD_FAIL_LDLM_ENQUEUE, 0);
-                rc = ldlm_handle_enqueue(req);
-                if (rc)
-                        break;
-                RETURN(0);
-        case LDLM_CONVERT:
-                CDEBUG(D_INODE, "convert\n");
-                OBD_FAIL_RETURN(OBD_FAIL_LDLM_CONVERT, 0);
-                rc = ldlm_handle_convert(req);
-                if (rc)
-                        break;
-                RETURN(0);
+        /* XXX FIXME move this back to mds/handler.c, bug 625069 */
         case LDLM_CANCEL:
                 CDEBUG(D_INODE, "cancel\n");
                 OBD_FAIL_RETURN(OBD_FAIL_LDLM_CANCEL, 0);
@@ -524,7 +510,6 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 if (rc)
                         break;
                 RETURN(0);
-        /* XXX FIXME move these three back to mds/handler.c, bug 625069 */
 
         default:
                 CERROR("invalid opcode %d\n", req->rq_reqmsg->opc);

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index ba219de..4d16f31 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -197,9 +197,6 @@ int ldlm_cli_enqueue(struct lustre_handle *connh,
         } else if (req->rq_reqmsg->buflens[0] != sizeof(*body))
                 LBUG();
 
-        req->rq_request_portal = LDLM_REQUEST_PORTAL; /* XXX FIXME bug 625069 */
-        req->rq_reply_portal = LDLM_REPLY_PORTAL; /* XXX FIXME bug 625069 */
-
         /* Dump all of this data into the request buffer */
         body = lustre_msg_buf(req->rq_reqmsg, 0);
         ldlm_lock2desc(lock, &body->lock_desc);
@@ -377,9 +374,6 @@ int ldlm_cli_convert(struct lustre_handle *lockh, int new_mode, int *flags)
         if (!req)
                 GOTO(out, rc = -ENOMEM);
 
-        req->rq_request_portal = LDLM_REQUEST_PORTAL; /* XXX FIXME bug 625069 */
-        req->rq_reply_portal = LDLM_REPLY_PORTAL; /* XXX FIXME bug 625069 */
-
         body = lustre_msg_buf(req->rq_reqmsg, 0);
         memcpy(&body->lock_handle1, &lock->l_remote_handle,
                sizeof(body->lock_handle1));

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index a064ba3..351fd5d 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -1056,6 +1056,20 @@ int mds_handle(struct ptlrpc_request *req)
                 rc = mds_close(req);
                 break;
 
+        case LDLM_ENQUEUE:
+                CDEBUG(D_INODE, "enqueue\n");
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_ENQUEUE, 0);
+                rc = ldlm_handle_enqueue(req);
+                if (rc)
+                        break;
+                RETURN(0);
+        case LDLM_CONVERT:
+                CDEBUG(D_INODE, "convert\n");
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_CONVERT, 0);
+                rc = ldlm_handle_convert(req);
+                if (rc)
+                        break;
+                RETURN(0);
         case LDLM_BL_CALLBACK:
         case LDLM_CP_CALLBACK:
                 CDEBUG(D_INODE, "callback\n");