rpms
/
ceph
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

librgw: add API version defines for librgw and rgw_file

This commit is contained in:
Ken Dreyer 2016-10-26 14:42:14 -06:00
parent ceab65be90
commit 680c925719
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0003-librgw-add-API-version-defines-for-librgw-and-rgw_fi.patch Normal file
View File

@ -0,0 +1,55 @@
From efebb1f5b68372d517e2279159ca5b9eaac30265 Mon Sep 17 00:00:00 2001
From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 23 Aug 2016 14:18:43 -0400
Subject: [PATCH] librgw: add API version defines for librgw and rgw_file
This change borrows the major, minor+extra format used by libcephfs.
The version numbering is starting at 1,1,0 on the theory that the
implicit version at Jewel is 1,0,0.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 355ccc5ded7f0b459bca24bc8b504b41807c583d)
(cherry picked from commit 2a9233f1fbff38c12d378d5b6528a7e576a62e3e)
Cherry-picking to Fedora to move nfs-ganesha-rgw along, see
https://bugzilla.redhat.com/1388690
---
src/include/rados/librgw.h | 7 +++++++
src/include/rados/rgw_file.h | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/src/include/rados/librgw.h b/src/include/rados/librgw.h
index 9ba8f3a..c20e96b 100644
--- a/src/include/rados/librgw.h
+++ b/src/include/rados/librgw.h
@@ -18,6 +18,13 @@
extern "C" {
#endif
+#define LIBRGW_VER_MAJOR 1
+#define LIBRGW_VER_MINOR 1
+#define LIBRGW_VER_EXTRA 0
+
+#define LIBRGW_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
+#define LIBRGW_VERSION_CODE LIBRGW_VERSION(LIBRGW_VER_MAJOR, LIBRGW_VER_MINOR, LIBRGW_VER_EXTRA)
+
typedef void* librgw_t;
int librgw_create(librgw_t *rgw, int argc, char **argv);
void librgw_shutdown(librgw_t rgw);
diff --git a/src/include/rados/rgw_file.h b/src/include/rados/rgw_file.h
index 4bb8a93..69995ca 100644
--- a/src/include/rados/rgw_file.h
+++ b/src/include/rados/rgw_file.h
@@ -24,6 +24,12 @@
extern "C" {
#endif
+#define LIBRGW_FILE_VER_MAJOR 1
+#define LIBRGW_FILE_VER_MINOR 1
+#define LIBRGW_FILE_VER_EXTRA 0
+
+#define LIBRGW_FILE_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
+#define LIBRGW_FILE_VERSION_CODE LIBRGW_FILE_VERSION(LIBRGW_FILE_VER_MAJOR, LIBRGW_FILE_VER_MINOR, LIBRGW_FILE_VER_EXTRA)
/*
* object types

6
ceph.spec
View File

@ -55,7 +55,7 @@
#################################################################################
Name: ceph
Version: 10.2.3
Release: 3%{?dist}
Release: 4%{?dist}
Epoch: 1
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@ -67,6 +67,7 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.gz
Patch0001: 0001-Disable-erasure_codelib-neon-build.patch
Patch0002: 0002-common-instantiate-strict_si_cast-long-not-strict_si.patch
Patch0003: 0003-librgw-add-API-version-defines-for-librgw-and-rgw_fi.patch
%if 0%{?suse_version}
%if 0%{?is_opensuse}
@ -1537,6 +1538,9 @@ exit 0
%changelog
* Wed Oct 26 2016 Ken Dreyer <ktdreyer@ktdreyer.com> 1:10.2.3-4
- librgw: add API version defines for librgw and rgw_file
* Wed Oct 26 2016 Ken Dreyer <ktdreyer@ktdreyer.com> 1:10.2.3-3
- update patches style for rdopkg