From 8a35a977b4322db5610d66c22a177256c987c6cd Mon Sep 17 00:00:00 2001 From: Andrew Elwell Date: Fri, 18 Jun 2021 09:38:40 +1000 Subject: [PATCH] LU-14771 ptlrpc: Rearrange version mismatch message Minor change to reposition the client version string on console warning message, and merge split string to one line Test-Parameters: trivial Signed-off-by: Andrew Elwell Change-Id: I89242cff873028f4f76bafdd5a14f169a98f7875 Reviewed-on: https://review.whamcloud.com/44029 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/ptlrpc/import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 64412cc..ed1b89b 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -859,15 +859,15 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp, const char *newer = "newer than client. " "Consider upgrading client"; - LCONSOLE_WARN("Server %s version (%d.%d.%d.%d) " - "is much %s (%s)\n", + LCONSOLE_WARN("Client version (%s). Server %s version (%d.%d.%d.%d) is much %s\n", + LUSTRE_VERSION_STRING, obd2cli_tgt(imp->imp_obd), OBD_OCD_VERSION_MAJOR(ocd->ocd_version), OBD_OCD_VERSION_MINOR(ocd->ocd_version), OBD_OCD_VERSION_PATCH(ocd->ocd_version), OBD_OCD_VERSION_FIX(ocd->ocd_version), ocd->ocd_version > LUSTRE_VERSION_CODE ? - newer : older, LUSTRE_VERSION_STRING); + newer : older); warned = true; } -- 1.8.3.1