os/ObjectStore: fix rebase errors

These were goofed by d74f1282cd268b4b04cfd9e90ddeac6d1dc6be7e.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 886f3582be52a750f421a17fc8e229950cdde324..10055acdce1bd2bbfc55cf823b1fc3736b76c999 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -720,7 +720,7 @@ public:
       ops++;
     }
     /// Set multiple xattrs of an object
-    void setattrs(coll_t cid, const hobject_t& oid, map<string,bufferlist>& attrset) {
+    void setattrs(coll_t cid, const ghobject_t& oid, map<string,bufferlist>& attrset) {
       __u32 op = OP_SETATTRS;
       ::encode(op, tbl);
       ::encode(cid, tbl);
@@ -1308,6 +1308,15 @@ public:
       value.push_back(bp);
     return r;
   }
+  int getattr(
+    coll_t cid, const ghobject_t& oid,
+    const string name, bufferlist& value) {
+    bufferptr bp;
+    int r = getattr(cid, oid, name.c_str(), bp);
+    value.push_back(bp);
+    return r;
+  }
+
   /**
    * getattrs -- get all of the xattrs of an object
    *