test/librbd/fsx: don't disable features for krbd

rbd_default_features is set in krbd suite, no need to hard-code this in
fsx (especially now when object-map, fast-diff and deep-flatten are all
supported).

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

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index 599e2596e1e2fe7588fd792f918fd19103eb8153..cee2a08960223fac08c2017b672c0be748bfcb94 100644 (file)
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -855,7 +855,7 @@ __librbd_deep_copy(struct rbd_ctx *ctx, const char *src_snapname,
 int
 __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
               const char *dst_imagename, int *order, int stripe_unit,
-              int stripe_count, bool krbd)
+              int stripe_count)
 {
        int ret;
 
@@ -879,12 +879,6 @@ __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
                 return ret;
         }
 
-       if (krbd) {
-               features &= ~(RBD_FEATURE_OBJECT_MAP     |
-                              RBD_FEATURE_FAST_DIFF      |
-                              RBD_FEATURE_DEEP_FLATTEN   |
-                              RBD_FEATURE_JOURNALING);
-       }
        if (deep_copy) {
                ret = __librbd_deep_copy(ctx, src_snapname, dst_imagename, features,
                                         order, stripe_unit, stripe_count);
@@ -913,7 +907,7 @@ librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
             int stripe_count)
 {
        return __librbd_clone(ctx, src_snapname, dst_imagename, order,
-                             stripe_unit, stripe_count, false);
+                             stripe_unit, stripe_count);
 }
 
 int
@@ -1181,7 +1175,7 @@ krbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
                return ret;
 
        return __librbd_clone(ctx, src_snapname, dst_imagename, order,
-                             stripe_unit, stripe_count, true);
+                             stripe_unit, stripe_count);
 }
 
 int
@@ -1321,7 +1315,7 @@ nbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
                return ret;
 
        return __librbd_clone(ctx, src_snapname, dst_imagename, order,
-                             stripe_unit, stripe_count, false);
+                             stripe_unit, stripe_count);
 }
 
 const struct rbd_operations nbd_operations = {
@@ -1569,7 +1563,7 @@ ggate_clone(struct rbd_ctx *ctx, const char *src_snapname,
        }
 
        return __librbd_clone(ctx, src_snapname, dst_imagename, order,
-                             stripe_unit, stripe_count, false);
+                             stripe_unit, stripe_count);
 }
 
 int