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

* Re: PATCH: link ceph-client version to kernel version
  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
  1 sibling, 1 reply; 5+ messages in thread
From: Sage Weil @ 2010-07-07 15:03 UTC (permalink / raw)
  To: Thomas Mueller; +Cc: ceph-devel

On Wed, 7 Jul 2010, Thomas Mueller wrote:
> 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.

Hmm, how does that work?  This would divorce the kclient version from the 
server side (which is basically already is, teh CEPH_VERSION* defines are 
ignored by the kclient currently) and match it up with the kernel version.  
For most people, that is just whatever upstream kernel they downloaded.

Is the goal just to make the standalone/backported code tell you which 
version the client code corresponds to?  If that's the case, I wonder the 
defines should be generated exclusively in the backport branches of the 
-standalone.git repo.

(Currently the only reason those defines are there at all is because the
ceph_fs.h header (along with a few others) is periodically synced up with 
the server code.  Probably they should be moved into a non-synced header 
to avoid that confusion.)

sage

> 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);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

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

* Re: PATCH: link ceph-client version to kernel version
  2010-07-07 15:03 ` Sage Weil
@ 2010-07-07 15:11   ` Thomas Mueller
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Mueller @ 2010-07-07 15:11 UTC (permalink / raw)
  To: Sage Weil; +Cc: ceph-devel

On 07.07.2010 17:03, Sage Weil wrote:
> , how does that work?  This would divorce the kclient version from the
> server side (which is basically already is, teh CEPH_VERSION* defines are
> ignored by the kclient currently) and match it up with the kernel version.
> For most people, that is just whatever upstream kernel they downloaded.
>
> Is the goal just to make the standalone/backported code tell you which
> version the client code corresponds to?  If that's the case, I wonder the
> defines should be generated exclusively in the backport branches of the
> -standalone.git repo.

yes and yes - this is only needed in ceph-client-standalone.

fact is, that kernels smaller than 2.6.34 will be standard next years - 
examples :
* Debian 5.0  2.6.26
* Ubuntu 10.04 LTS: 2.6.32
* Debian 6.0 2.6.32
* RHEL/CentOS 6 2.6.32

they all will need backported ceph modules. if there is no version 
output in modinfo it will be hard to say which version is loaded.

- Thomas

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

* Re: PATCH: link ceph-client version to kernel version
  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 17:34 ` Brian Jackson
  2010-07-07 18:04   ` Brian Jackson
  1 sibling, 1 reply; 5+ messages in thread
From: Brian Jackson @ 2010-07-07 17:34 UTC (permalink / raw)
  To: Thomas Mueller; +Cc: ceph-devel

On Wednesday, July 07, 2010 03:54:00 am Thomas Mueller wrote:
> 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.


That makes sense for KVM because it's reached a level of maturity where they 
only bother doing the backports of specific kernel releases. I don't think 
it's a good idea for ceph to go this direction yet. Mostly I'd hate to see the 
standalone client packages only released when there's a new kernel. It seems 
like something that would be more useful once ceph has some kernel releases 
under it's belt.



> 
> I've also patched super.c to expose the version to modinfo.
> 
> - Thomas
> 
> 
<snip>

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

* Re: PATCH: link ceph-client version to kernel version
  2010-07-07 17:34 ` Brian Jackson
@ 2010-07-07 18:04   ` Brian Jackson
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Jackson @ 2010-07-07 18:04 UTC (permalink / raw)
  To: Thomas Mueller; +Cc: ceph-devel

On Wednesday, July 07, 2010 12:34:35 pm Brian Jackson wrote:
> On Wednesday, July 07, 2010 03:54:00 am Thomas Mueller wrote:
> > 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.
> 
> That makes sense for KVM because it's reached a level of maturity where
> they only bother doing the backports of specific kernel releases. I don't
> think it's a good idea for ceph to go this direction yet. Mostly I'd hate
> to see the standalone client packages only released when there's a new
> kernel. It seems like something that would be more useful once ceph has
> some kernel releases under it's belt.


Cancel that. Talked to sagewk on irc and he said development of the kclient is 
taking place in upstream git now, so I guess this does make sense.



> 
> > I've also patched super.c to expose the version to modinfo.
> > 
> > - Thomas
> 
> <snip>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[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.