Fix build error on arm

0003-librbd-Conditionally-import-TrimRequest.cc.patch

@@ -0,0 +1,39 @@
+From 7001040df1194b802e7ac523aa4325a414ae89b3 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Fri, 8 Dec 2017 00:21:38 +0100
+Subject: [PATCH] librbd: Conditionally import TrimRequest.cc
+
+We include TrimRequest.cc in librbd tests at two places:
+ - operation/test_mock_TrimRequest.cc
+ - operation/test_mock_ResizeRequest.cc
+
+That causes linking errors when doing the builds because some of the
+structures are defined twice.
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/librbd/operation/TrimRequest.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
+index 28f2deb..415f98c 100644
+--- a/src/librbd/operation/TrimRequest.cc
++++ b/src/librbd/operation/TrimRequest.cc
+@@ -1,6 +1,9 @@
+ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+ // vim: ts=8 sw=2 smarttab
+ 
++#ifndef CEPH_LIBRBD_OPERATION_TRIM_REQUEST_CC
++#define CEPH_LIBRBD_OPERATION_TRIM_REQUEST_CC
++
+ #include "librbd/operation/TrimRequest.h"
+ #include "librbd/AsyncObjectThrottle.h"
+ #include "librbd/ExclusiveLock.h"
+@@ -363,3 +366,4 @@ void TrimRequest<I>::send_finish(int r) {
+ } // namespace librbd
+ 
+ template class librbd::operation::TrimRequest<librbd::ImageCtx>;
++#endif
+-- 
+2.9.5
+

ceph.spec

@@ -105,6 +105,7 @@ Source0:	http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
 Patch001:	0001-src-rocksdb-util-murmurhash.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1474774
 Patch002:	0002-cmake-Support-ppc64.patch
+Patch003:	0003-librbd-Conditionally-import-TrimRequest.cc.patch
 %if 0%{?suse_version}
 %if 0%{?is_opensuse}
 ExclusiveArch:	x86_64 aarch64 ppc64 ppc64le
@@ -1813,6 +1814,7 @@ exit 0
 %changelog
 * Tue Dec 5 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.2-1
 - New release (1:12.2.2-1)
+- Fix build error on arm
 
 * Thu Oct 05 2017 Boris Ranto <branto@redhat.com> - 1:12.2.1-2
 - Obsolete ceph-libs-compat package