LU-11240 gnilnd: Replace KGNILND_BUILD_REV

The current format of the gnilnd version string causes a compilation
error. Since gnilnd doesn't really need its own version string we just
replace it with LUSTRE_VERSION_STRING.

Cray-bug-id: LUS-6072
Test-Parameters: trivial
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I6f45df2566853a6f4c2078cf72c7eac7a52f3fad
Reviewed-on: https://review.whamcloud.com/32990
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Chuck Fossen <chuckf@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index 9171fcd..1fd80be 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -2893,7 +2893,7 @@ static int __init kgnilnd_init(void)
        if (rc != 0)
                return rc;
 
-       printk(KERN_INFO "Lustre: kgnilnd build version: "KGNILND_BUILD_REV"\n");
+       LCONSOLE_INFO("Lustre: kgnilnd build version: "LUSTRE_VERSION_STRING"\n");
 
        kgnilnd_insert_sysctl();
        kgnilnd_proc_init();
@@ -2905,7 +2905,7 @@ static int __init kgnilnd_init(void)
 
 MODULE_AUTHOR("Cray, Inc. <nic@cray.com>");
 MODULE_DESCRIPTION("Gemini LNet Network Driver");
-MODULE_VERSION(KGNILND_BUILD_REV);
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
 module_init(kgnilnd_init);

diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h
index b511c9f..2c4968a 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.h
+++ b/lnet/klnds/gnilnd/gnilnd.h
@@ -64,7 +64,6 @@
 #include <lnet/lib-lnet.h>
 
 #include <gni_pub.h>
-#include "gnilnd_version.h"
 
 static inline time_t cfs_duration_sec(long duration_jiffies)
 {

diff --git a/lnet/klnds/gnilnd/gnilnd_sysctl.c b/lnet/klnds/gnilnd/gnilnd_sysctl.c
index b8f7dd0..aa08d80 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_sysctl.c
+++ b/lnet/klnds/gnilnd/gnilnd_sysctl.c
@@ -238,8 +238,8 @@ static struct ctl_table kgnilnd_table[] = {
        {
                INIT_CTL_NAME
                .procname = "version",
-               .data     = KGNILND_BUILD_REV,
-               .maxlen   = sizeof(KGNILND_BUILD_REV),
+               .data     = LUSTRE_VERSION_STRING,
+               .maxlen   = sizeof(LUSTRE_VERSION_STRING),
                .mode     = 0444,
                .proc_handler = &proc_dostring
        },

diff --git a/lnet/klnds/gnilnd/gnilnd_version.h b/lnet/klnds/gnilnd/gnilnd_version.h
deleted file mode 100644 (file)
index 360a0cb..0000000
--- a/lnet/klnds/gnilnd/gnilnd_version.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2012 Cray, Inc.
- *
- *   Author: Nic Henke <nic@cray.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#define KGNILND_BUILD_REV        SVN_CODE_REV