From: Kefu Chai <kchai@redhat.com>
Date: Tue, 17 May 2016 03:18:01 +0000 (+0800)
Subject: osd,auth: silence "-Wmisleading-indentation" warnings
X-Git-Tag: v11.0.0~517^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9159%2Fhead;p=ceph.git

osd,auth: silence "-Wmisleading-indentation" warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index f5793239e85..8d5bdef379c 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -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);
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 43ef40ffb99..3da944df3e3 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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));