Fix the arm compile patch

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

@@ -1,4 +1,4 @@
-From 7001040df1194b802e7ac523aa4325a414ae89b3 Mon Sep 17 00:00:00 2001
+From 74a754690736f6608b0d4d9c807df0bd777a129d 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
@@ -12,26 +12,18 @@ structures are defined twice.
 
 Signed-off-by: Boris Ranto <branto@redhat.com>
 ---
- src/librbd/operation/TrimRequest.cc | 4 ++++
+ src/librbd/operation/TrimRequest.cc | 2 ++
- 1 file changed, 4 insertions(+)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
-index 28f2deb..415f98c 100644
+index 28f2deb..929ca51 100644
 --- a/src/librbd/operation/TrimRequest.cc
 +++ b/src/librbd/operation/TrimRequest.cc
-@@ -1,6 +1,9 @@
+@@ -362,4 +362,6 @@ void TrimRequest<I>::send_finish(int r) {
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+ } // namespace operation
- // 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
  
++#ifndef TEST_F
  template class librbd::operation::TrimRequest<librbd::ImageCtx>;
 +#endif
 --