]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd,auth: silence "-Wmisleading-indentation" warnings 9159/head
authorKefu Chai <kchai@redhat.com>
Tue, 17 May 2016 03:18:01 +0000 (11:18 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 17 May 2016 05:17:06 +0000 (13:17 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/auth/KeyRing.cc
src/osd/ReplicatedPG.cc

index f5793239e853444f8a013d2b43ce2d58ee8eadc9..8d5bdef379cd198530364702cf6d30fd66dd8af5 100644 (file)
@@ -111,11 +111,11 @@ int KeyRing::set_modifier(const char *type, const char *val, EntityName& name, m
     const char *caps_entity = type + 5;
     if (!*caps_entity)
       return -EINVAL;
-      string l(val);
-      bufferlist bl;
-      ::encode(l, bl);
-      caps[caps_entity] = bl;
-      set_caps(name, caps);
+    string l(val);
+    bufferlist bl;
+    ::encode(l, bl);
+    caps[caps_entity] = bl;
+    set_caps(name, caps);
   } else if (strcmp(type, "auid") == 0) {
     uint64_t auid = strtoull(val, NULL, 0);
     set_uid(name, auid);
index 43ef40ffb9982136ba29c96b39d146266c26f990..3da944df3e367e8f9c998d8e2e948943a654464d 100644 (file)
@@ -9372,8 +9372,8 @@ SnapSetContext *ReplicatedPG::get_snapset_context(
        // try _snapset
       if (!(oid.is_snapdir() && !oid_existed))
        r = pgbackend->objects_get_attr(oid.get_snapdir(), SS_ATTR, &bv);
-       if (r < 0 && !can_create)
-         return NULL;
+      if (r < 0 && !can_create)
+       return NULL;
       }
     } else {
       assert(attrs->count(SS_ATTR));