From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 2 Sep 2016 09:48:39 +0000 (+0800)
Subject: os/bluestore: don't overwrite type if it does already exist and at desired type
X-Git-Tag: v11.0.1~335^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5addd84436cb852c7defc2d6065f67d469ced8e7;p=ceph.git

os/bluestore: don't overwrite type if it does already exist and at desired type

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 260e328b2a1a..a9872f8a9c8c 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -2690,10 +2690,11 @@ int BlueStore::mkfs()
 	dout(1) << __func__ << " expected bluestore, but type is " << type << dendl;
 	return -EIO;
       }
+    } else {
+      r = write_meta("type", "bluestore");
+      if (r < 0)
+        return r;
     }
-    r = write_meta("type", "bluestore");
-    if (r < 0)
-      return r;
   }
 
   freelist_type = g_conf->bluestore_freelist_type;