All of lore.kernel.org
 help / color / mirror / Atom feed
* PATCH: link ceph-client version to kernel version
@ 2010-07-07  8:54 Thomas Mueller
  2010-07-07 15:03 ` Sage Weil
  2010-07-07 17:34 ` Brian Jackson
  0 siblings, 2 replies; 5+ messages in thread
From: Thomas Mueller @ 2010-07-07  8:54 UTC (permalink / raw)
  To: ceph-devel

hi

reading the version in ceph_fs.h made me think, that now that ceph is in 
vanilla kernel, it would be nice to have the version linked to the kernel 
version. this is how the kvm guys work for their backported module.

I've also patched super.c to expose the version to modinfo.

- Thomas


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);


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-07-07 18:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-07  8:54 PATCH: link ceph-client version to kernel version Thomas Mueller
2010-07-07 15:03 ` Sage Weil
2010-07-07 15:11   ` Thomas Mueller
2010-07-07 17:34 ` Brian Jackson
2010-07-07 18:04   ` Brian Jackson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.