]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cls/rbd: set_features should adjust the mask to known features
authorJason Dillaman <dillaman@redhat.com>
Tue, 20 Sep 2016 18:34:16 +0000 (14:34 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 20 Sep 2016 18:34:16 +0000 (14:34 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/cls/rbd/cls_rbd.cc

index f7bf2e33411012acfd111d186f36649402ba1f5e..c90bc335326328981712f6cf2a5f494ee2be4678 100644 (file)
@@ -414,6 +414,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,