staging: lustre: ptlrpc: quiet warning for 2.1/2.5 connections

The Lustre 2.5.4 client will print a warning about connections with
2.1.3 servers, yet they are still supposed to be interoperable.
Increase the window of warning to be up to Lustre 2.5.50, since we
do not intend to allow interoperability between 2.1 and 2.6 systems.
This was from the time when major releases like Lustre 1.4 and 1.8
were many years apart would have no chance for interoperation.

Only print this message once per client, to avoid flooding the console
for connections to many servers or frequent network reconnections.
Server versions should all be nearly the same in any case.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2528
Reviewed-on: http://review.whamcloud.com/7916
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index bf7b9d2aaa2bb6bb2d6e6006bf06f52364f9165a..a4f7544f46b89ff807516ae0b4cf52e5b1f67ca0 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -1001,6 +1001,8 @@ finish:
                        return 0;
                }
        } else {
+               static bool warned;
+
                spin_lock(&imp->imp_lock);
                list_del(&imp->imp_conn_current->oic_item);
                list_add(&imp->imp_conn_current->oic_item, &imp->imp_conn_list);
@@ -1020,7 +1022,7 @@ finish:
                        goto out;
                }
 
-               if ((ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
+               if (!warned && (ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
                    (ocd->ocd_version > LUSTRE_VERSION_CODE +
                                        LUSTRE_VERSION_OFFSET_WARN ||
                     ocd->ocd_version < LUSTRE_VERSION_CODE -
@@ -1028,10 +1030,8 @@ finish:
                        /* Sigh, some compilers do not like #ifdef in the middle
                         * of macro arguments
                         */
-                       const char *older = "older. Consider upgrading server or downgrading client"
-                               ;
-                       const char *newer = "newer than client version. Consider upgrading client"
-                                           ;
+                       const char *older = "older than client. Consider upgrading server";
+                       const char *newer = "newer than client. Consider recompiling application";
 
                        LCONSOLE_WARN("Server %s version (%d.%d.%d.%d) is much %s (%s)\n",
                                      obd2cli_tgt(imp->imp_obd),
@@ -1041,6 +1041,7 @@ finish:
                                      OBD_OCD_VERSION_FIX(ocd->ocd_version),
                                      ocd->ocd_version > LUSTRE_VERSION_CODE ?
                                      newer : older, LUSTRE_VERSION_STRING);
+                       warned = true;
                }
 
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0)