diff mbox series

[11/28] lustre: ptlrpc: Rearrange version mismatch message

Message ID 1655560330-30743-12-git-send-email-jsimmons@infradead.org (mailing list archive)
State Not Applicable
Headers show
Series lustre: sync to OpenSFS June 15, 2022 | expand

Commit Message

James Simmons June 18, 2022, 1:51 p.m. UTC 
From: Andrew Elwell <Andrew.Elwell@gmail.com>

Minor change to reposition the client version string on
console warning message.

WC-bug-id: https://jira.whamcloud.com/browse/LU-14771
Lustre-commit: 8a35a977b4322db56 ("LU-14771 ptlrpc: Rearrange version mismatch message")
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Reviewed-on: https://review.whamcloud.com/44029
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 fs/lustre/ptlrpc/import.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/fs/lustre/ptlrpc/import.c b/fs/lustre/ptlrpc/import.c
index c0aee34..d685b96 100644
--- a/fs/lustre/ptlrpc/import.c
+++ b/fs/lustre/ptlrpc/import.c
@@ -853,14 +853,15 @@  static int ptlrpc_connect_set_flags(struct obd_import *imp,
 		const char *older = "older than client. Consider upgrading server";
 		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;
 	}