diff mbox

PATCH: link ceph-client version to kernel version

Message ID i11fb7$mk1$1@dough.gmane.org (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Mueller July 7, 2010, 8:54 a.m. UTC 
None
diff mbox

Patch

diff --git a/ceph_fs.h b/ceph_fs.h
index 63ff461..cfc995b 100644
--- a/ceph_fs.h
+++ b/ceph_fs.h
@@ -18,16 +18,17 @@ 
 /*
  * Ceph release version
  */
-#define CEPH_VERSION_MAJOR 0
-#define CEPH_VERSION_MINOR 20
-#define CEPH_VERSION_PATCH 0
+#define CEPH_VERSION_MAJOR 2
+#define CEPH_VERSION_MINOR 6
+#define CEPH_VERSION_PATCH 35
+#define CEPH_VERSION_FIX 0
 
 #define _CEPH_STRINGIFY(x) #x
 #define CEPH_STRINGIFY(x) _CEPH_STRINGIFY(x)
-#define CEPH_MAKE_VERSION(x, y, z) CEPH_STRINGIFY(x) "." CEPH_STRINGIFY(y) \
-       "." CEPH_STRINGIFY(z)
+#define CEPH_MAKE_VERSION(w, x, y, z) CEPH_STRINGIFY(w) "." CEPH_STRINGIFY(x) \
+       "." CEPH_STRINGIFY(y) "." CEPH_STRINGIFY(z)
 #define CEPH_VERSION CEPH_MAKE_VERSION(CEPH_VERSION_MAJOR, \
-                                      CEPH_VERSION_MINOR, CEPH_VERSION_PATCH)
+                                      CEPH_VERSION_MINOR, CEPH_VERSION_PATCH, CEPH_VERSION_FIX)
 
 /*
  * subprotocol versions.  when specific messages types or high-level
diff --git a/super.c b/super.c
index 27447a2..93d9c59 100644
--- a/super.c
+++ b/super.c
@@ -1149,3 +1149,4 @@  MODULE_AUTHOR("Yehuda Sadeh <yehuda@hq.newdream.net>");
 MODULE_AUTHOR("Patience Warnick <patience@newdream.net>");
 MODULE_DESCRIPTION("Ceph filesystem for Linux");
 MODULE_LICENSE("GPL");
+MODULE_INFO(version, CEPH_VERSION);