diff --git a/[refs] b/[refs] index 6e75acba5952..974794c8f94a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e324b8f991679a43e09dd13500bf1988c0bfc0ea +refs/heads/master: fa0b72e9e2900ee87886aaf8bc4c4701be1e081d diff --git a/trunk/fs/ceph/ceph_ver.h b/trunk/fs/ceph/ceph_ver.h deleted file mode 100644 index 66c3727b671b..000000000000 --- a/trunk/fs/ceph/ceph_ver.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CEPH_VERSION_H -#define __CEPH_VERSION_H - -#define CEPH_GIT_VER 335cd8f952b457095ea2a66aee3db50efb63c91d - -#endif diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c index 0723fb6e96a1..b3404a319c22 100644 --- a/trunk/fs/ceph/super.c +++ b/trunk/fs/ceph/super.c @@ -16,7 +16,6 @@ #include #include -#include "ceph_ver.h" #include "decode.h" #include "super.h" #include "mon_client.h" @@ -903,7 +902,9 @@ static int __init init_ceph(void) if (ret) goto out_icache; - pr_info("loaded (%s)\n", STRINGIFY(CEPH_GIT_VER)); + pr_info("loaded %d.%d.%d (mon/mds/osd proto %d/%d/%d)\n", + CEPH_VERSION_MAJOR, CEPH_VERSION_MINOR, CEPH_VERSION_PATCH, + CEPH_MONC_PROTOCOL, CEPH_MDSC_PROTOCOL, CEPH_OSDC_PROTOCOL); return 0; out_icache: