]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
BlueStore: verify fsid in a more proper way during mkfs
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 18 Jan 2016 08:33:23 +0000 (16:33 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 18 Jan 2016 08:33:23 +0000 (16:33 +0800)
Fixes: #14394
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueStore.cc

index 8ed73cc98bed2dde1ae948ec555fc1e134b69287..f83f16c7f446247b7f0c2bc383106489420c290b 100644 (file)
@@ -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;