From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 13 May 2015 14:10:39 +0000 (+0300)
Subject: tests: disable deep-flatten feature for the krbd fsx test
X-Git-Tag: v9.0.2~174
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92ed6e584d15282e74aa7c920b9983cd9955d9d0;p=ceph.git

tests: disable deep-flatten feature for the krbd fsx test

krbd doesn't support fast-diff or deep-flatten yet.  Had to do this
with two commits because fast-diff is in next and deep-flatten isn't.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index 250dbb5e7db1..238d6ab085ba 100644
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -483,7 +483,8 @@ __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
 	if (krbd) {
 		features &= ~(RBD_FEATURE_EXCLUSIVE_LOCK |
 		              RBD_FEATURE_OBJECT_MAP     |
-                              RBD_FEATURE_FAST_DIFF);
+                              RBD_FEATURE_FAST_DIFF      |
+                              RBD_FEATURE_DEEP_FLATTEN);
 	}
 	ret = rbd_clone2(ioctx, ctx->name, src_snapname, ioctx,
 			 dst_imagename, features, order,