From 2607cd6d00c50a536c277f711ef33518661c9c6a Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 28 Jun 2006 17:16:18 +0000 Subject: [PATCH] Branch b1_5 r=adilger print lustre ver when obdclass module loads --- lustre/lov/lov_obd.c | 2 +- lustre/obdclass/class_obd.c | 12 +++++++----- lustre/osc/osc_request.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index b54a431..6c6da21 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -2660,5 +2660,5 @@ MODULE_AUTHOR("Cluster File Systems, Inc. "); MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver"); MODULE_LICENSE("GPL"); -cfs_module(lov, "1.0.0", lov_init, lov_exit); +cfs_module(lov, LUSTRE_VERSION_STRING, lov_init, lov_exit); #endif diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 0144c70..6cc4013 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -520,11 +520,13 @@ int init_obdclass(void) #ifdef __KERNEL__ int lustre_register_fs(void); - printk(KERN_INFO "Lustre: OBD class driver Build Version: " - BUILD_VERSION", info@clusterfs.com\n"); + printk(KERN_INFO "Lustre: OBD class driver, info@clusterfs.com\n"); + printk(KERN_INFO " Lustre Version: "LUSTRE_VERSION_STRING"\n"); + printk(KERN_INFO " Build Version: "BUILD_VERSION"\n"); #else - CDEBUG(D_INFO, "Lustre: OBD class driver Build Version: " - BUILD_VERSION", info@clusterfs.com\n"); + CDEBUG(D_INFO, "Lustre: OBD class driver, info@clusterfs.com\n"); + CDEBUG(D_INFO, " Lustre Version: "LUSTRE_VERSION_STRING"\n"); + CDEBUG(D_INFO, " Build Version: "BUILD_VERSION"\n"); #endif spin_lock_init(&obd_types_lock); @@ -600,5 +602,5 @@ MODULE_AUTHOR("Cluster File Systems, Inc. "); MODULE_DESCRIPTION("Lustre Class Driver Build Version: " BUILD_VERSION); MODULE_LICENSE("GPL"); -cfs_module(obdclass, "1.0.0", init_obdclass, cleanup_obdclass); +cfs_module(obdclass, LUSTRE_VERSION_STRING, init_obdclass, cleanup_obdclass); #endif diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 9dae4d6..543c156 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3821,5 +3821,5 @@ MODULE_AUTHOR("Cluster File Systems, Inc. "); MODULE_DESCRIPTION("Lustre Object Storage Client (OSC)"); MODULE_LICENSE("GPL"); -cfs_module(osc, "1.0.0", osc_init, osc_exit); +cfs_module(osc, LUSTRE_VERSION_STRING, osc_init, osc_exit); #endif -- 1.8.3.1