Merge pull request ceph#8763 from wjwithagen/patch-10

os/filestore: Make sure str-pointer is not 0x0 when referenced Reviewed-by: xie xingguo <[email protected]>
siplabs · May 4, 2016 · 449f81e · 449f81e
2 parents b84f906 + 629929a
commit 449f81e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
@@ -4928,7 +4928,7 @@ int FileStore::omap_get_values(const coll_t& _c, const ghobject_t &hoid,
   const coll_t& c = !_need_temp_object_collection(_c, hoid) ? _c : _c.get_temp();
   dout(15) << __func__ << " " << c << "/" << hoid << dendl;
   Index index;
-  const char *where = 0;
+  const char *where = "()";
   int r = get_index(c, &index);
   if (r < 0) {
     where = " (get_index)";
@@ -4946,6 +4946,7 @@ int FileStore::omap_get_values(const coll_t& _c, const ghobject_t &hoid,
   r = object_map->get_values(hoid, keys, out);
   if (r < 0 && r != -ENOENT) {
     assert(!m_filestore_fail_eio || r != -EIO);
+    where = " (get_values)";
     goto out;
   }
   r = 0;