Merge pull request ceph#65714 from batrick/objstore-warning

os: resolve unused variable warning

Author: SrinivasaBharath

src/os/ObjectStore.cc

@@ -70,20 +70,20 @@ int ObjectStore::probe_block_device_fsid(
   const string& path,
   uuid_d *fsid)
 {
-  int r;
-
 #if defined(WITH_BLUESTORE)
   // first try bluestore -- it has a crc on its header and will fail
   // reliably.
-  r = BlueStore::get_block_device_fsid(cct, path, fsid);
+  int r = BlueStore::get_block_device_fsid(cct, path, fsid);
   if (r == 0) {
     lgeneric_dout(cct, 0) << __func__ << " " << path << " is bluestore, "
 			  << *fsid << dendl;
     return r;
+  } else {
+    return -EINVAL;
   }
-#endif
-
+#else
   return -EINVAL;
+#endif
 }
 
 int ObjectStore::write_meta(const std::string& key,