From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 17 Feb 2015 01:44:04 +0000 (-0500)
Subject: test/librbd/fsx.c: disable RBD object map for krbd
X-Git-Tag: v0.93~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f55d4168fe5a1945dc0ac3abb6fb94d70536dda;p=ceph.git

test/librbd/fsx.c: disable RBD object map for krbd

RBD object map requires exclusive lock support, which is not
yet available in the kernel client.

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

diff --git a/src/test/librbd/fsx.c b/src/test/librbd/fsx.c
index 37e5db11fe90..e2ad45c4bb3f 100644
--- a/src/test/librbd/fsx.c
+++ b/src/test/librbd/fsx.c
@@ -480,7 +480,8 @@ __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
 
 	uint64_t features = RBD_FEATURES_ALL;
 	if (krbd) {
-		features &= ~RBD_FEATURE_EXCLUSIVE_LOCK;
+		features &= ~(RBD_FEATURE_EXCLUSIVE_LOCK |
+		              RBD_FEATURE_OBJECT_MAP);
 	}
 	ret = rbd_clone2(ioctx, ctx->name, src_snapname, ioctx,
 			 dst_imagename, features, order,