cls/rbd: set_features should adjust the mask to known features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a26c7a5cacebf8814e20a2f3d5b69c20d8798871)

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index c430adf77a6c8752e6ca4879695d9584eb396503..6adc31fa25cdca7dcc5a0d0574293d106fd7eedf 100644 (file)
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -409,6 +409,9 @@ int set_features(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
     return r;
   }
 
+  // newer clients might attempt to mask off features we don't support
+  mask &= RBD_FEATURES_ALL;
+
   uint64_t enabled_features = features & mask;
   if ((enabled_features & RBD_FEATURES_MUTABLE) != enabled_features) {
     CLS_ERR("Attempting to enable immutable feature: %" PRIu64,