]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kstore: fix fsid validation logic during mkfs
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 19 Jan 2016 03:34:09 +0000 (11:34 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 19 Jan 2016 11:32:02 +0000 (19:32 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/kstore/KStore.cc

index 2aa62536cfd77c172f699331ea5fefe8b984a03c..af16de56ebccf7955976e23faf80bc683b8777b6 100644 (file)
@@ -924,7 +924,7 @@ int KStore::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;