From: Samuel Just <sam.just@inktank.com>
Date: Mon, 13 Jan 2014 19:02:45 +0000 (-0800)
Subject: DBObjectMap::clear_keys_header: use generate_new_header, not _generate_new_header
X-Git-Tag: v0.77~25^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c92dc6f5cacff711d6e2db99d6ad0a57ead0e6a;p=ceph.git

DBObjectMap::clear_keys_header: use generate_new_header, not _generate_new_header

We aren't holding the header_lock here, so we need the locked version.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/os/DBObjectMap.cc b/src/os/DBObjectMap.cc
index 059984fd161..9057748341f 100644
--- a/src/os/DBObjectMap.cc
+++ b/src/os/DBObjectMap.cc
@@ -798,7 +798,7 @@ int DBObjectMap::clear_keys_header(const ghobject_t &oid,
     return r;
 
   // create new header
-  Header newheader = _generate_new_header(oid, Header());
+  Header newheader = generate_new_header(oid, Header());
   set_map_header(oid, *newheader, t);
   if (attrs.size())
     t->set(xattr_prefix(newheader), attrs);