ceph: show meaningful version on module load

Kill the old git revision; print the ceph version and protocol
versions instead.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/fs/ceph/ceph_ver.h b/fs/ceph/ceph_ver.h
deleted file mode 100644 (file)
index 66c3727..0000000
--- a/fs/ceph/ceph_ver.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __CEPH_VERSION_H
-#define __CEPH_VERSION_H
-
-#define CEPH_GIT_VER 335cd8f952b457095ea2a66aee3db50efb63c91d
-
-#endif

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 0723fb6e96a17e0ebf8f90c0f809f0a3ca005716..b3404a319c22f6a4f515ddfee4d85b7b61375fe4 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -16,7 +16,6 @@
 #include <linux/version.h>
 #include <linux/vmalloc.h>
 
-#include "ceph_ver.h"
 #include "decode.h"
 #include "super.h"
 #include "mon_client.h"
@@ -903,7 +902,9 @@ static int __init init_ceph(void)
        if (ret)
                goto out_icache;
 
-       pr_info("loaded (%s)\n", STRINGIFY(CEPH_GIT_VER));
+       pr_info("loaded %d.%d.%d (mon/mds/osd proto %d/%d/%d)\n",
+               CEPH_VERSION_MAJOR, CEPH_VERSION_MINOR, CEPH_VERSION_PATCH,
+               CEPH_MONC_PROTOCOL, CEPH_MDSC_PROTOCOL, CEPH_OSDC_PROTOCOL);
        return 0;
 
 out_icache: