diff options
Diffstat (limited to 'src/osdc/Objecter.h')
| -rw-r--r-- | src/osdc/Objecter.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 154ee410fde..45ff0c0b58c 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -7,9 +7,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #ifndef CEPH_OBJECTER_H @@ -768,15 +768,15 @@ struct ObjectOperation { class Objecter { - public: + public: Messenger *messenger; MonClient *monc; OSDMap *osdmap; CephContext *cct; bool initialized; - - private: + +private: tid_t last_tid; int client_inc; uint64_t max_linger_id; @@ -1514,9 +1514,9 @@ private: } tid_t getxattrs(const object_t& oid, const object_locator_t& oloc, snapid_t snap, - map<string,bufferlist>& attrset, - int flags, Context *onfinish, - version_t *objver = NULL, ObjectOperation *extra_ops = NULL) { + map<string,bufferlist>& attrset, + int flags, Context *onfinish, + version_t *objver = NULL, ObjectOperation *extra_ops = NULL) { vector<OSDOp> ops; int i = init_ops(ops, 1, extra_ops); ops[i].op.op = CEPH_OSD_OP_GETXATTRS; @@ -1533,9 +1533,10 @@ private: version_t *objver = NULL, ObjectOperation *extra_ops = NULL) { return read(oid, oloc, 0, 0, snap, pbl, flags | global_op_flags | CEPH_OSD_FLAG_READ, onfinish, objver); } + // writes - tid_t _modify(const object_t& oid, const object_locator_t& oloc, + tid_t _modify(const object_t& oid, const object_locator_t& oloc, vector<OSDOp>& ops, utime_t mtime, const SnapContext& snapc, int flags, Context *onack, Context *oncommit, |