PATCH: link ceph-client version to kernel version

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxx>");
 MODULE_AUTHOR("Patience Warnick <patience@xxxxxxxxxxxx>");
 MODULE_DESCRIPTION("Ceph filesystem for Linux");
 MODULE_LICENSE("GPL");
+MODULE_INFO(version, CEPH_VERSION);

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux