From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 17 Jul 2017 04:08:00 +0000 (-0400)
Subject: librbd: bypass large image creation check of object-map disabled
X-Git-Tag: v12.1.2~151^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cde2090b3016acff1d166f95ac361c6221a18a5c;p=ceph.git

librbd: bypass large image creation check of object-map disabled

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

diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc
index 6ebfebbfd45..f7376db9a85 100644
--- a/src/librbd/image/CreateRequest.cc
+++ b/src/librbd/image/CreateRequest.cc
@@ -257,7 +257,8 @@ void CreateRequest<I>::send() {
     return;
   }
 
-  if (!validate_layout(m_cct, m_size, m_layout)) {
+  if (((m_features & RBD_FEATURE_OBJECT_MAP) != 0) &&
+      (!validate_layout(m_cct, m_size, m_layout))) {
     complete(-EINVAL);
     return;
   }