LU-1644 mgc: remove obsolete IR swabbing workaround

[fs/lustre-release.git] / lustre / ptlrpc / import.c

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index dcd42f0..2e7ac0e 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -175,16 +175,15 @@ int ptlrpc_set_import_discon(struct obd_import *imp, __u32 conn_cnt)
                                "lost; in progress operations using this "
                                "service will wait for recovery to complete\n",
                                imp->imp_obd->obd_name, target_len, target_start,
-                               libcfs_nid2str(imp->imp_connection->c_peer.nid));
-                } else {
-                        LCONSOLE_ERROR_MSG(0x166, "%s: Connection to "
-                               "%.*s (at %s) was lost; in progress "
-                               "operations using this service will fail\n",
-                               imp->imp_obd->obd_name,
-                               target_len, target_start,
-                               libcfs_nid2str(imp->imp_connection->c_peer.nid));
-                }
-                IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
+                              obd_import_nid2str(imp));
+               } else {
+                       LCONSOLE_ERROR_MSG(0x166, "%s: Connection to "
+                              "%.*s (at %s) was lost; in progress "
+                              "operations using this service will fail\n",
+                              imp->imp_obd->obd_name, target_len, target_start,
+                              obd_import_nid2str(imp));
+               }
+               IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
                spin_unlock(&imp->imp_lock);
 
                if (obd_dump_on_timeout)
@@ -832,25 +831,6 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp,
                warned = true;
        }
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       /* Check if server has LU-1252 fix applied to not always swab
-        * the IR MNE entries. Do this only once per connection.  This
-        * fixup is version-limited, because we don't want to carry the
-        * OBD_CONNECT_MNE_SWAB flag around forever, just so long as we
-        * need interop with unpatched 2.2 servers.  For newer servers,
-        * the client will do MNE swabbing only as needed.  LU-1644 */
-       if (unlikely((ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
-                    !(ocd->ocd_connect_flags & OBD_CONNECT_MNE_SWAB) &&
-                    OBD_OCD_VERSION_MAJOR(ocd->ocd_version) == 2 &&
-                    OBD_OCD_VERSION_MINOR(ocd->ocd_version) == 2 &&
-                    OBD_OCD_VERSION_PATCH(ocd->ocd_version) < 55 &&
-                    strcmp(imp->imp_obd->obd_type->typ_name,
-                           LUSTRE_MGC_NAME) == 0))
-               imp->imp_need_mne_swab = 1;
-       else /* clear if server was upgraded since last connect */
-               imp->imp_need_mne_swab = 0;
-#endif
-
        if (ocd->ocd_connect_flags & OBD_CONNECT_CKSUM) {
                /* We sent to the server ocd_cksum_types with bits set
                 * for algorithms we understand. The server masked off
@@ -1535,7 +1515,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
                LCONSOLE_INFO("%s: Connection restored to %s (at %s)\n",
                              imp->imp_obd->obd_name,
                              obd_uuid2str(&conn->c_remote_uuid),
-                             libcfs_nid2str(imp->imp_connection->c_peer.nid));
+                             obd_import_nid2str(imp));
         }
 
        if (imp->imp_state == LUSTRE_IMP_FULL) {