- fix typo of chkconnect in lmv_set_info.

- add MDS_PARSE_ID check.

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 85c6501..2fd67cb 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -2109,7 +2109,7 @@ int lmv_set_info(struct obd_export *exp, obd_count keylen,
         }
 
         if (keylen == strlen("chkconnect") && 
-            memcpy(key, "chkconnect", keylen) == 0) {
+            memcmp(key, "chkconnect", keylen) == 0) {
                 rc = lmv_check_connect(obd);
                 RETURN(rc);
         }

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 075e942..044d84b 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -2953,6 +2953,7 @@ static int mds_msg_check_version(struct lustre_msg *msg)
         case MDS_DONE_WRITING:
         case MDS_PIN:
         case MDS_SYNC:
+        case MDS_PARSE_ID:
                 rc = lustre_msg_check_version(msg, LUSTRE_MDS_VERSION);
                 if (rc)
                         CERROR("bad opc %u version %08x, expecting %08x\n",

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 134f822..04fb65b 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -820,6 +820,7 @@ main(int argc, char **argv)
         CHECK_VALUE(MDS_SYNC);
         CHECK_VALUE(MDS_DONE_WRITING);
         CHECK_VALUE(MDS_ACCESS_CHECK);
+        CHECK_VALUE(MDS_PARSE_ID);
         CHECK_VALUE(MDS_LAST_OPC);
 
         CHECK_VALUE(REINT_SETATTR);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 2d4f3de..dc2c190 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -25,7 +25,7 @@ int main()
 void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
-         * running on Linux localhost.localdomain 2.6.12-1.1372_FC3 #1 Fri Jul 15 00:59:10 EDT 2005 i
+         * running on Linux localhost.localdomain 2.6.9-1.667 #1 Tue Nov 2 14:41:25 EST 2004 i686 i68
          * with gcc version 3.4.3 20050227 (Red Hat 3.4.3-22.fc3) */
 
 
@@ -120,6 +120,8 @@ void lustre_assert_wire_constants(void)
                  (unsigned long long)MDS_DONE_WRITING);
         LASSERTF(MDS_ACCESS_CHECK == 46, " found %llu\n",
                  (unsigned long long)MDS_ACCESS_CHECK);
+        LASSERTF(MDS_PARSE_ID == 47, " found %llu\n",
+                 (unsigned long long)MDS_PARSE_ID);
         LASSERTF(MDS_LAST_OPC == 48, " found %llu\n",
                  (unsigned long long)MDS_LAST_OPC);
         LASSERTF(REINT_SETATTR == 1, " found %llu\n",