From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 18 Dec 2015 18:14:58 +0000 (-0500)
Subject: librbd: extra request required if journal enabled w/ caching
X-Git-Tag: v10.0.2~23^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=200d310635971641e65bb699619a28a9807cc535;p=ceph.git

librbd: extra request required if journal enabled w/ caching

Fixes: #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/AioImageRequest.cc b/src/librbd/AioImageRequest.cc
index f0c3228119c6..45627e0c0a55 100644
--- a/src/librbd/AioImageRequest.cc
+++ b/src/librbd/AioImageRequest.cc
@@ -375,7 +375,7 @@ uint64_t AioImageDiscard::append_journal_event(
 
 uint32_t AioImageDiscard::get_cache_request_count(bool journaling) const {
   // extra completion request is required for tracking journal commit
-  return (journaling ? 1 : 0);
+  return (m_image_ctx.object_cacher != nullptr && journaling ? 1 : 0);
 }
 
 void AioImageDiscard::send_cache_requests(const ObjectExtents &object_extents,