From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 18 Jan 2016 08:33:23 +0000 (+0800)
Subject: BlueStore: verify fsid in a more proper way during mkfs
X-Git-Tag: v10.0.4~195^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5183ff3df6a834bb04d3ccdc65a7a67fb0241892;p=ceph.git

BlueStore: verify fsid in a more proper way during mkfs

Fixes: #14394
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 8ed73cc98bed..f83f16c7f446 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1618,7 +1618,7 @@ int BlueStore::mkfs()
     goto out_close_fsid;
 
   r = _read_fsid(&old_fsid);
-  if (r < 0 && old_fsid.is_zero()) {
+  if (r < 0 || old_fsid.is_zero()) {
     if (fsid.is_zero()) {
       fsid.generate_random();
       dout(1) << __func__ << " generated fsid " << fsid << dendl;