]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: drop cateogry support from CREATE
authorSage Weil <sage@redhat.com>
Fri, 31 Oct 2014 16:48:22 +0000 (09:48 -0700)
committerSage Weil <sage@redhat.com>
Mon, 1 Dec 2014 17:37:56 +0000 (09:37 -0800)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/ReplicatedPG.cc

index 116f04ac1c298c0c732a7c143eeb6614eb1554cb..28be8dd3274f5fbc8e2ce46aa244f7309c54fa75 100644 (file)
@@ -4166,14 +4166,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
              result = -EINVAL;
              goto fail;
            }
-           if (category.size()) {
-             if (obs.exists && !oi.is_whiteout()) {
-               if (obs.oi.category != category)
-                 result = -EEXIST;  // category cannot be reset
-             } else {
-               obs.oi.category = category;
-             }
-           }
+           // category is no longer implemented.
          }
           if (result >= 0) {
             if (!obs.exists)