From patchwork Wed Jul 7 08:54:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Mueller X-Patchwork-Id: 110579 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o678sCEW019523 for ; Wed, 7 Jul 2010 08:54:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753709Ab0GGIyL (ORCPT ); Wed, 7 Jul 2010 04:54:11 -0400 Received: from lo.gmane.org ([80.91.229.12]:57771 "EHLO lo.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271Ab0GGIyK (ORCPT ); Wed, 7 Jul 2010 04:54:10 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OWQON-0000XC-Nz for ceph-devel@vger.kernel.org; Wed, 07 Jul 2010 10:54:07 +0200 Received: from 80-219-106-215.dclient.hispeed.ch ([80.219.106.215]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Jul 2010 10:54:07 +0200 Received: from thomas by 80-219-106-215.dclient.hispeed.ch with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Jul 2010 10:54:07 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: ceph-devel@vger.kernel.org From: Thomas Mueller Subject: PATCH: link ceph-client version to kernel version Date: Wed, 7 Jul 2010 08:54:00 +0000 (UTC) Lines: 48 Message-ID: Mime-Version: 1.0 X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 80-219-106-215.dclient.hispeed.ch User-Agent: Pan/0.133 (House of Butterflies) Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Jul 2010 08:54:13 +0000 (UTC) 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 "); MODULE_AUTHOR("Patience Warnick "); MODULE_DESCRIPTION("Ceph filesystem for Linux"); MODULE_LICENSE("GPL"); +MODULE_INFO(version, CEPH_VERSION);